diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysDepartUserTreeModel.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysDepartUserTreeModel.java index 8dcb954eb..77cbff325 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysDepartUserTreeModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/SysDepartUserTreeModel.java @@ -74,6 +74,8 @@ public class SysDepartUserTreeModel implements Serializable { private String updateBy; + private String disableCheckbox; + private Date updateTime; private List list = new ArrayList<>(); //当前部门的用户列表,不包括子部门的 @@ -312,6 +314,14 @@ public class SysDepartUserTreeModel implements Serializable { public SysDepartUserTreeModel() { } + public String getDisableCheckbox() { + return disableCheckbox; + } + + public void setDisableCheckbox(String disableCheckbox) { + this.disableCheckbox = disableCheckbox; + } + /** * 重写equals方法 */ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index a609186a2..6fb2a31f2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -1426,7 +1426,7 @@ public class SysUserController { List sysUserList = sysUserService.getUserListByDepIds(departIds); String json = sysPushVO.getJson(); List allJson = JSONObject.parseArray(json, SysDepartUserTreeModel.class); - dealwithTree(departId, departTreeModelList, allJson,sysUserList); + dealwithTree(departId, departTreeModelList, allJson,sysUserList,sysPushVO.getFlag()); result.setResult(allJson); } else { List departUserTreeModelList = new ArrayList<>(); @@ -1434,6 +1434,10 @@ public class SysUserController { //复制 SysDepartUserTreeModel target = new SysDepartUserTreeModel(); BeanUtils.copyProperties(sysDepartTreeModel, target); + //flag=1,为人员选择标识,此时部门禁选,只能选择部门 + if("1".equals(sysPushVO.getFlag())){ + target.setDisableCheckbox("true"); + } departUserTreeModelList.add(target); } result.setResult(departUserTreeModelList); @@ -1509,7 +1513,8 @@ public class SysUserController { private void dealwithTree(String departId, List departTreeModelList, List json, - List sysUserList) { + List sysUserList, + String flag) { for (SysDepartUserTreeModel sysDepartUserTreeModel : json) { String id = sysDepartUserTreeModel.getId(); if (id.equals(departId)) { @@ -1518,6 +1523,10 @@ public class SysUserController { //复制 SysDepartUserTreeModel target = new SysDepartUserTreeModel(); BeanUtils.copyProperties(sysDepartTreeModel, target); + //flag=1,为人员选择标识,此时部门禁选,只能选择部门 + if("1".equals(flag)){ + target.setDisableCheckbox("true"); + } treeList.add(target); } if(CollectionUtils.isNotEmpty(sysUserList)){ @@ -1541,7 +1550,7 @@ public class SysUserController { List children = sysDepartUserTreeModel.getChildren(); if (CollectionUtils.isNotEmpty(children)) { //复制 - dealwithTree(departId, departTreeModelList, children,sysUserList); + dealwithTree(departId, departTreeModelList, children,sysUserList,flag); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysPushVO.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysPushVO.java index d53750e20..e70b46414 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysPushVO.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysPushVO.java @@ -16,4 +16,9 @@ public class SysPushVO { * 列表JSON */ private String json; + + /** + * 标识(flag = 0-->推送,flag = 1-->人员选择) + */ + private String flag; }