WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档库推送信息处理

Browse Source
This commit is contained in:
wangchengjun
2022-03-24 13:28:40 +08:00
parent c12aa0538a
commit 7f9f448884
3 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+23 -3
View File
@@ -1397,9 +1397,12 @@ public class SysUserController {
//获取当前组织下数据
List<SysDepartTreeModel> departTreeModelList = sysDepartService.queryTreeListByDepartId(departId);
if (StringUtils.isNotEmpty(departId)) {
List<String> departIds = new ArrayList<>();
departIds.add(departId);
List<SysUser> sysUserList = sysUserService.getUserListByDepIds(departIds);
String json = sysPushVO.getJson();
List<SysDepartUserTreeModel> allJson = JSONObject.parseArray(json, SysDepartUserTreeModel.class);
dealwithTree(departId, departTreeModelList, allJson);
dealwithTree(departId, departTreeModelList, allJson,sysUserList);
result.setResult(allJson);
} else {
List<SysDepartUserTreeModel> departUserTreeModelList = new ArrayList<>();
@@ -1441,8 +1444,12 @@ public class SysUserController {
* @param departId 当前选中组织ID
* @param departTreeModelList 当前组织下数据
* @param json 其他组织数据
* @param sysUserList 用户信息
*/
private void dealwithTree(String departId, List<SysDepartTreeModel> departTreeModelList, List<SysDepartUserTreeModel> json) {
private void dealwithTree(String departId,
List<SysDepartTreeModel> departTreeModelList,
List<SysDepartUserTreeModel> json,
List<SysUser> sysUserList) {
for (SysDepartUserTreeModel sysDepartUserTreeModel : json) {
String id = sysDepartUserTreeModel.getId();
if (id.equals(departId)) {
@@ -1453,6 +1460,19 @@ public class SysUserController {
BeanUtils.copyProperties(sysDepartTreeModel, target);
treeList.add(target);
}
if(CollectionUtils.isNotEmpty(sysUserList)){
for (SysUser sysUser : sysUserList) {
//复制
SysDepartUserTreeModel target = new SysDepartUserTreeModel();
BeanUtils.copyProperties(sysUser, target);
target.setKey(sysUser.getId());
target.setTitle(sysUser.getRealname()+"("+sysUser.getUsername()+")");
target.setChildren(null);
target.setIsLeaf(true);
treeList.add(target);
}
}
sysDepartUserTreeModel.setChildren(treeList);
break;
@@ -1460,7 +1480,7 @@ public class SysUserController {
List<SysDepartUserTreeModel> children = sysDepartUserTreeModel.getChildren();
if (CollectionUtils.isNotEmpty(children)) {
//复制
dealwithTree(departId, departTreeModelList, children);
dealwithTree(departId, departTreeModelList, children,sysUserList);
}
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml
-12
View File
@@ -69,18 +69,6 @@
</if>
</select>
<select id="getUserListByDepIds" resultType="com.jero.modules.system.entity.SysUser">
select * from sys_user where del_flag = 0
<if test="departIds!=null and departIds.size()>0">
and id in (select dru.user_id from sys_depart_role dr, sys_depart_role_user dru where dr.id = dru.drole_id and dr.depart_id in
<foreach collection="departIds" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
)
</if>
</select>
<!-- 根据角色Id查询 -->
<select id="getUserByRoleId" resultType="com.jero.modules.system.entity.SysUser">
select * from sys_user where del_flag = 0 and id in (select user_id from sys_user_role where role_id=#{roleId})