From f00bce4f19320d84cd142dbe855cbd958c749cc2 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 25 May 2022 09:39:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E---=E6=B7=BB=E5=8A=A0=E6=96=87=E6=A1=A3=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java       | 4 ++--
 .../com/jero/modules/home/entity/HomeDocumentDynamicEO.java  | 5 +++++
 .../modules/home/mapper/xml/HomeDocumentDynamicEOMapper.xml  | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index f62a5ea3d..e71f97077 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1457,7 +1457,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     public void addInfo(Map<String, Object> map) {
         String cut = (String) map.get("cut");
-
         try {
             String serialNumber = (String)map.get("serial_number");
             //编码验重
@@ -1971,7 +1970,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
         //文档动态,  文档库中新增了标准XXXX  homeDocumentDynamicEOService
         HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
-        homeDocumentDynamicEO.setMsgContent("文档库中新增了标准" + href);
+        homeDocumentDynamicEO.setMsgContent("文档库中新增了标准" + serialNumber);
+        homeDocumentDynamicEO.setMsgContentInfo("文档库中新增了标准" + href);
         homeDocumentDynamicEOService.save(homeDocumentDynamicEO);
 
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java
index 077f40a52..9ce5da311 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/entity/HomeDocumentDynamicEO.java
@@ -66,4 +66,9 @@ public class HomeDocumentDynamicEO implements Serializable {
     @ApiModelProperty(value = "消息内容")
     private java.lang.String msgContent;
 
+	/**消息内容详情*/
+	@Excel(name = "消息内容详情", width = 15)
+    @ApiModelProperty(value = "消息内容详情")
+    private java.lang.String msgContentInfo;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeDocumentDynamicEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeDocumentDynamicEOMapper.xml
index 91d88a77e..55a40b2d0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeDocumentDynamicEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/mapper/xml/HomeDocumentDynamicEOMapper.xml
@@ -9,5 +9,6 @@
         <result column="update_time" property="updateTime" />
         <result column="sys_org_code" property="sysOrgCode" />
         <result column="msg_content" property="msgContent" />
+        <result column="msg_content_info" property="msgContentInfo" />
     </resultMap>
 </mapper>

From 29a9df04031ffcaa10ce3426f242c0c9f775d7d4 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Wed, 25 May 2022 09:40:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[update]=20=E9=83=A8=E9=97=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/UserList.vue        |  18 ++-
 .../system/modules/departmentAllocation.vue   | 151 ++++++++++++++++++
 2 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 jero-web/src/views/system/modules/departmentAllocation.vue

diff --git a/jero-web/src/views/system/UserList.vue b/jero-web/src/views/system/UserList.vue
index ca08b72d2..41c5eff03 100644
--- a/jero-web/src/views/system/UserList.vue
+++ b/jero-web/src/views/system/UserList.vue
@@ -85,7 +85,7 @@
       <!--      </a-upload>-->
       <!--      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{$t('recycleBin')}}</a-button>-->
       <a-button type="primary" icon="hdd" @click="RoleAssignment">{{$t('RoleAssignment')}}</a-button>
-      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">{{$t('departmentAllocation')}}</a-button>
+      <a-button type="primary" icon="hdd" @click="departmentAllocation">{{$t('departmentAllocation')}}</a-button>
 <!--      <div @click="handleExportXls($t('userInformation'))" class="operator-text">-->
 <!--        <a-icon type="export" :rotate="-90"/>-->
 <!--        {{$t('export')}}-->
@@ -127,11 +127,16 @@
     <a-modal v-model="rolevisible" :title="$t('RoleAssignment')" width='650px' :footer="null">
       <role-assignment v-if='rolevisible' :selectedRowKeysArray='selectedRowKeys'></role-assignment>
     </a-modal>
+    <!-- 部门配置 -->
+    <a-modal v-model="departmentvisible" :title="$t('RoleAssignment')" width='650px' :footer="null">
+      <department-allocation v-if='departmentvisible' :selectedRowKeysArray='selectedRowKeys'></department-allocation>
+    </a-modal>
   </a-card>
 </template>
 
 <script>
   import RoleAssignment from './modules/RoleAssignment'
+  import DepartmentAllocation from './modules/departmentAllocation'
   import UserModal from './modules/UserModal'
   import PasswordModal from './modules/PasswordModal'
   import { putAction, getFileAccessHttpUrl } from '@/api/manage'
@@ -145,6 +150,7 @@
     name: 'UserList',
     mixins: [JeroListMixin],
     components: {
+      DepartmentAllocation,
       RoleAssignment,
       UserModal,
       PasswordModal,
@@ -159,6 +165,7 @@
         recycleBinVisible: false,
         toggleSearchStatus:false,
         rolevisible: false, // 角色配置得弹框
+        departmentvisible: false, // 部门配置得弹框
         selectedRowKeys: [],
         selectedRowKeysvalue: [],
         columns: [
@@ -254,6 +261,15 @@
         this.selectedRowKeys = val
         this.selectedRowKeysvalue = value
       },
+      // 部门配置
+      departmentAllocation() {
+        if(this.selectedRowKeys.length  == 0) {
+          this.$message.warning(this.$t('selectLeastOne'))
+        } else {
+          this.departmentvisible = true
+        }
+      },
+      // 角色配置
       RoleAssignment: function(){
         if(this.selectedRowKeys.length  == 0) {
           this.$message.warning(this.$t('selectLeastOne'))
diff --git a/jero-web/src/views/system/modules/departmentAllocation.vue b/jero-web/src/views/system/modules/departmentAllocation.vue
new file mode 100644
index 000000000..c4e24e2b6
--- /dev/null
+++ b/jero-web/src/views/system/modules/departmentAllocation.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class='diolag-area'>
+    <a-spin :spinning='spinLoading'>
+      <a-form-model
+        class='tag-module'
+        ref='ruleForm'
+        :model='form'
+        :rules='rules'
+        :label-col='labelCol'
+        :wrapper-col='wrapperCol'
+      >
+        <a-row :gutter='24'>
+          <a-col :span='24'>
+            <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select mode="multiple" :placeholder="$t('PleaseSelect')+$t('controlVerification')" v-model:value="selectedRole">
+                <a-select-option v-for="(role,roleindex) in roleList" :key="role.id" :value="role.id">
+                    <span style="display: inline-block;width: 100%">
+                      {{ role.roleName }}
+                    </span>
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+    <div class='drawer-bootom-button'>
+      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
+      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('determine') }}</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
+import axios from 'axios'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
+import moment from 'moment'
+// import eventBUs from '../../common/event'
+export default {
+  name: 'diolagArea',
+  components: {},
+  data() {
+    return {
+      token:Vue.ls.get(ACCESS_TOKEN),
+      title: this.$t('add'),
+      total: 0,
+      selectedRowKeysDate: {},
+      loading: false,
+      editId: '',
+      newVisible: false,
+      selectedRole: undefined,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 14 }
+      },
+      form: {},
+      rules: {},
+      areaTable: [],
+      flag: false,  //表单提交标识
+      spinLoading: false,
+      confirmLoading: false,
+      selectedRowKeys: [],
+      roleList: [],
+      defaultValue: undefined
+    }
+  },
+  props: {
+    selectedRowKeysArray: {
+      type: Array,
+      default: [],
+      require: true
+    }
+  },
+  mounted() {
+    this.loadData()
+  },
+  methods: {
+    loadData() {
+      this.loading = true
+      getAction(`sys/role/queryall`, {}).then(res => {
+        if (res.success) {
+          this.roleList = [...res.result]
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    handleCancel() {
+      this.$emit('areaVisibleTaskCutOffTimeflag', false)
+    },
+    //保存
+    handleSubmit() {
+      let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}` }
+      postAction('/sys/user/setRole', param).then((res) => {
+        if (res.success) {
+          this.$emit('areaVisibleTaskCutOffTimeflag', false)
+          this.$message.success(res.message)
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang='less' scoped>
+@import '~@assets/less/common.less';
+
+.diolag-area {
+  .table-area {
+    margin: 20px 0;
+
+    .action-edit {
+      margin-right: 10px;
+    }
+  }
+
+  .table-del {
+    color: red;
+  }
+}
+.drawer-bootom-button{
+  display: flex;
+  justify-content: center;
+}
+</style>
+<style lang='less'>
+.area-module {
+  .ant-modal-wrap {
+    .ant-modal {
+      .ant-modal-content {
+        .ant-modal-footer {
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+.page{
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 20px;
+}
+</style>
\ No newline at end of file