用户列表过滤调整，根据角色选择用户默认数据隔离

src/api/platform/org/employee.js

@@ -5,162 +5,161 @@ import { BUSINESS_BASE_URL } from '@/api/baseUrl'
  * 查询列表数据
  * @param {*} params
  */
-export function queryPageList(data, params) {
-  return request({
-    url: ORG_URL() + '/employee/query',
-    method: 'post',
-    data,
-    params
-  })
+export function queryPageList (data) {
+    return request({
+        url: ORG_URL() + '/employee/query',
+        method: 'post',
+        data
+    })
 }
 /**
  * 删除数据
  * @param {*} params
  */
-export function remove(params) {
-  return request({
-    url: ORG_URL() + '/employee/remove',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function remove (params) {
+    return request({
+        url: ORG_URL() + '/employee/remove',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  * 创建数据
  * @param {*} data
  */
-export function create(data) {
-  return request({
-    url: ORG_URL() + '/employee/create',
-    method: 'post',
-    isLoading: true,
-    data
-  })
+export function create (data) {
+    return request({
+        url: ORG_URL() + '/employee/create',
+        method: 'post',
+        isLoading: true,
+        data
+    })
 }
 
 /**
  * 保存数据验证
  * * @param {*} params
  */
- export function upEmployee(data) {
+export function upEmployee (data) {
     return request({
-      url: BUSINESS_BASE_URL() + '/sys/universal/upEmployee',
-      method: 'post',
-      data
+        url: BUSINESS_BASE_URL() + '/sys/universal/upEmployee',
+        method: 'post',
+        data
     })
-  }
+}
 
 /**
  * 保存数据
  * @param {*} params
  */
-export function update(data) {
-  return request({
-    url: ORG_URL() + '/employee/update',
-    method: 'post',
-    isLoading: true,
-    data
-  })
+export function update (data) {
+    return request({
+        url: ORG_URL() + '/employee/update',
+        method: 'post',
+        isLoading: true,
+        data
+    })
 }
 
 /**
  * 获取数据
  * @param {*} params
  */
-export function get(params) {
-  return request({
-    url: ORG_URL() + '/employee/get',
-    method: 'get',
-    params
-  })
+export function get (params) {
+    return request({
+        url: ORG_URL() + '/employee/get',
+        method: 'get',
+        params
+    })
 }
 
 /**
  * 获取数据
  * @param {*} params
  */
-export function load(params) {
-  return request({
-    url: ORG_URL() + '/employee/load',
-    method: 'get',
-    params
-  })
+export function load (params) {
+    return request({
+        url: ORG_URL() + '/employee/load',
+        method: 'get',
+        params
+    })
 }
 
 /**
  * 获取数据(通过ID转换为名称)
  * @param {*} params
  */
-export function transfer(params) {
-  return request({
-    url: ORG_URL() + '/employee/transfer',
-    method: 'post',
-    data: params
-  })
+export function transfer (params) {
+    return request({
+        url: ORG_URL() + '/employee/transfer',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  * 用户激活
  * @param {*} params
  */
-export function active(params) {
-  return request({
-    url: ORG_URL() + '/employee/active',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function active (params) {
+    return request({
+        url: ORG_URL() + '/employee/active',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 /**
  * 用户禁用
  * @param {*} params
  */
-export function disable(params) {
-  return request({
-    url: ORG_URL() + '/employee/disable',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function disable (params) {
+    return request({
+        url: ORG_URL() + '/employee/disable',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  * 员工列表分页(带组织名称)
  * @param {*} params
  */
-export function queryWithOrg(params) {
-  return request({
-    url: ORG_URL() + '/employee/queryWithOrg',
-    method: 'post',
-    data: params
-  })
+export function queryWithOrg (params) {
+    return request({
+        url: ORG_URL() + '/employee/queryWithOrg',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  * 添加岗位人员
  * @param {*} params
  */
-export function addPositionUser(params) {
-  return request({
-    url: ORG_URL() + '/employee/addPositionUser',
-    method: 'post',
-    isLoading: true,
-    data: params
-  })
+export function addPositionUser (params) {
+    return request({
+        url: ORG_URL() + '/employee/addPositionUser',
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }
 
 /**
  * 移除岗位人员
  * @param {*} params
  */
-export function removePositionUser(params) {
-  return request({
-    url: ORG_URL() + '/employee/removePositionUser',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function removePositionUser (params) {
+    return request({
+        url: ORG_URL() + '/employee/removePositionUser',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 // ==========================组织人员======================
@@ -168,86 +167,86 @@ export function removePositionUser(params) {
  * 获取组织人员
  * @param {*} params
  */
-export function queryOrgUser(params) {
-  return request({
-    url: ORG_URL() + '/employee/queryOrgUser',
-    method: 'post',
-    data: params
-  })
+export function queryOrgUser (params) {
+    return request({
+        url: ORG_URL() + '/employee/queryOrgUser',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  * 移除组织人员
  * @param {*} params
  */
-export function removeOrgUser(params) {
-  return request({
-    url: ORG_URL() + '/employee/removeOrgUser',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function removeOrgUser (params) {
+    return request({
+        url: ORG_URL() + '/employee/removeOrgUser',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 /**
  * 添加组织人员数据
  * @param {*} params
  */
-export function addOrgUser(params) {
-  return request({
-    url: ORG_URL() + '/employee/addOrgUser',
-    method: 'post',
-    isLoading: true,
-    data: params
-  })
+export function addOrgUser (params) {
+    return request({
+        url: ORG_URL() + '/employee/addOrgUser',
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }
 /**
  * 获取未分配组织人员列表
  * @param {*} params
  */
-export function queryWoutOrg(params) {
-  return request({
-    url: ORG_URL() + '/employee/queryWoutOrg',
-    method: 'post',
-    data: params
-  })
+export function queryWoutOrg (params) {
+    return request({
+        url: ORG_URL() + '/employee/queryWoutOrg',
+        method: 'post',
+        data: params
+    })
 }
 // ==========================上下级======================
 
 // 员工下属列表分页
-export function queryUnderPageList(params) {
-  return request({
-    url: ORG_URL() + '/employee/queryUnder',
-    method: 'post',
-    data: params
-  })
+export function queryUnderPageList (params) {
+    return request({
+        url: ORG_URL() + '/employee/queryUnder',
+        method: 'post',
+        data: params
+    })
 }
 // 员工上级列表分页
-export function querySuperiorPageList(params) {
-  return request({
-    url: ORG_URL() + '/employee/querySuperior',
-    method: 'post',
-    data: params
-  })
+export function querySuperiorPageList (params) {
+    return request({
+        url: ORG_URL() + '/employee/querySuperior',
+        method: 'post',
+        data: params
+    })
 }
 
 // 添加员工下属
-export function addUnder(params) {
-  return request({
-    url: ORG_URL() + '/employee/addUnder',
-    method: 'post',
-    isLoading: true,
-    data: params
-  })
+export function addUnder (params) {
+    return request({
+        url: ORG_URL() + '/employee/addUnder',
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }
 
 // 移除员工下属
-export function removeUnder(params) {
-  return request({
-    url: ORG_URL() + '/employee/removeUnder',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function removeUnder (params) {
+    return request({
+        url: ORG_URL() + '/employee/removeUnder',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 // ===================组织负责人管理============================================
@@ -256,36 +255,36 @@ export function removeUnder(params) {
  * 查询组织负责人数据
  * @param {*} params
  */
-export function queryOrgManager(params) {
-  return request({
-    url: ORG_URL() + '/employee/queryOrgManager',
-    method: 'post',
-    data: params
-  })
+export function queryOrgManager (params) {
+    return request({
+        url: ORG_URL() + '/employee/queryOrgManager',
+        method: 'post',
+        data: params
+    })
 }
 /**
  * 删除组织负责人数据
  * @param {*} params
  */
-export function removeOrgManager(params) {
-  return request({
-    url: ORG_URL() + '/employee/removeOrgManager',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function removeOrgManager (params) {
+    return request({
+        url: ORG_URL() + '/employee/removeOrgManager',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 /**
  * 添加组织负责人数据
  * @param {*} params
  */
-export function addOrgManager(params) {
-  return request({
-    url: ORG_URL() + '/employee/addOrgManager',
-    method: 'post',
-    isLoading: true,
-    data: params
-  })
+export function addOrgManager (params) {
+    return request({
+        url: ORG_URL() + '/employee/addOrgManager',
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }
 
 // ===================角色人员管理============================================
@@ -294,48 +293,48 @@ export function addOrgManager(params) {
  * 获取角色人员数据
  * @param {*} params
  */
-export function queryByRoleId(params) {
-  return request({
-    url: ORG_URL() + '/employee/queryByRoleId',
-    method: 'post',
-    data: params
-  })
+export function queryByRoleId (params) {
+    return request({
+        url: ORG_URL() + '/employee/queryByRoleId',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  * 员工列表分页
  * @param {*} params
  */
-export function queryWithOrg4Position(params) {
-  return request({
-    url: ORG_URL() + '/employee/queryWithOrg4Position',
-    method: 'post',
-    data: params
-  })
+export function queryWithOrg4Position (params) {
+    return request({
+        url: ORG_URL() + '/employee/queryWithOrg4Position',
+        method: 'post',
+        data: params
+    })
 }
 
 /**
  * 添加角色人员数据
  * @param {*} params
  */
-export function addRoleUser(params) {
-  return request({
-    url: ORG_URL() + '/role/addUser',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function addRoleUser (params) {
+    return request({
+        url: ORG_URL() + '/role/addUser',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 
 /**
  * 移除角色人员
  * @param {*} params
  */
-export function removeRoleUser(params) {
-  return request({
-    url: ORG_URL() + '/role/removeUser',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function removeRoleUser (params) {
+    return request({
+        url: ORG_URL() + '/role/removeUser',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }

src/business/platform/bpmn/setting/bpmn-setting/settings/other-attribute.vue

@@ -160,7 +160,6 @@ export default {
             return this.data
         },
         formVars () {
-            console.log(getSubjectRuleVars(this.boDefData, this.variables))
             return getSubjectRuleVars(this.boDefData, this.variables)
         }
     },

src/business/platform/data/templaterender/templates/list.vue

@@ -1296,7 +1296,8 @@ export default {
                         }
                         break
                 }
-                if (allInIt) {
+                // 所有字段都在fields范围内或最后一个字段在fields范围内时，去除最后一个字段的宽度
+                if (allInIt || fields.includes(displayColumns[displayColumns.length - 1].name)) {
                     displayColumns[displayColumns.length - 1].width = ''
                 }
                 const field = this.convertField(col)

src/business/platform/org/employee/panel.vue

@@ -135,7 +135,15 @@ export default {
         }
     },
     data () {
+        const { first = '', second = '' } = this.$store.getters.level
+        const { isSuper = '', account = '' } = this.$store.getters
+        const special = ['admin', 'jinyuan']
+        let level = second || first
+        if (special.includes(account) && isSuper) {
+            level = null
+        }
         return {
+            level,
             width: 200,
             dialogFormVisible: false, // 弹窗
             editId: '',
@@ -269,8 +277,8 @@ export default {
     },
     methods: {
         /**
-       * 加载数据
-       */
+         * 加载数据
+         */
         loadListData () {
             let type = this.partyType
             this.loading = true
@@ -304,15 +312,7 @@ export default {
                     this.loading = false
                 })
             } else {
-                // 过滤数据
-                const { first = '', second = '' } = this.$store.getters.level
-                const { isSuper = '', account = '' } = this.$store.getters
-                const special = ['admin', 'jinyuan']
-                let t = { position: second || first }
-                if (special.includes(account) && isSuper) {
-                    t = null
-                }
-                queryPageList(this.getFormatParams(), t).then(response => {
+                queryPageList(this.getFormatParams('1')).then(response => {
                     this.loading = false
                     ActionUtils.handleListData(this, response.data)
                     this.setSelectRow()
@@ -336,7 +336,7 @@ export default {
         /**
          * 获取查询条件格式化参数
          */
-        getFormatParams () {
+        getFormatParams (flag = '0') {
             const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
             const key = this.partyType === 'org' ? 'orgId' : this.partyType === 'position' ? 'positionId' : this.partyType === 'role' ? 'roleId' : this.partyType === 'group' ? 'groupId' : ''
             if (this.showTree) {
@@ -357,10 +357,14 @@ export default {
             // if (this.$utils.isNotEmpty(this.currentOrgId)) {
             //   params['orgId'] = this.partyId || this.currentOrgId
             // }
-            return ActionUtils.formatParams(
-                params,
-                this.pagination,
-                this.sorts)
+            const res = ActionUtils.formatParams(params, this.pagination, this.sorts)
+            // 数据过滤
+            if (this.level && (flag === '1' || this.partyType === 'role')) {
+                res.customs = {
+                    position: this.level
+                }
+            }
+            return res
         },
         /**
          * 处理分页事件

src/views/platform/org/employee/list.vue

@@ -75,7 +75,15 @@ export default {
     },
     mixins: [CustomDataDisplayMixin],
     data () {
+        const { first = '', second = '' } = this.$store.getters.level
+        const { isSuper = '', account = '' } = this.$store.getters
+        const special = ['admin', 'jinyuan']
+        let level = second || first
+        if (special.includes(account) && isSuper) {
+            level = null
+        }
         return {
+            level,
             height: document.clientHeight,
             title: '',
             moreSearchTitle: '更多查询',
@@ -318,14 +326,7 @@ export default {
         // 加载数据
         loadData () {
             this.loading = true
-            const { first = '', second = '' } = this.$store.getters.level
-            const { isSuper = '', account = '' } = this.$store.getters
-            const special = ['admin', 'jinyuan']
-            let t = { position: second || first }
-            if (special.includes(account) && isSuper) {
-                t = null
-            }
-            queryPageList(this.getSearcFormData(), t).then((response) => {
+            queryPageList(this.getSearcFormData()).then((response) => {
                 response.data.dataResult.forEach(item => {
                     if (item.positions) {
                         // 转换岗位名
@@ -380,7 +381,13 @@ export default {
             if (this.moreSearchParams) {
                 Object.assign(params, this.moreSearchParams)
             }
-            return ActionUtils.formatParams(params, this.pagination, this.sorts)
+            const res = ActionUtils.formatParams(params, this.pagination, this.sorts)
+            if (this.level) {
+                res.customs = {
+                    position: this.level
+                }
+            }
+            return res
         },
         /**
          * 处理分页事件