个人用户信息优化

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -618,6 +618,8 @@ public class SysUserController extends BaseController
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(userId, user.getCompanyId());
 
+        SysDept sysDept = deptService.selectDeptById(user.getDeptId());
+
         //公司用户判断角色isAuto是否包括1数据，如包含则菜单权限数据取企业-产品-菜单数据
         //不包含则取角色-菜单 与 企业产品菜单数据并集
         //获取用户角色列表，判断是否存在isAuto
@@ -632,6 +634,7 @@ public class SysUserController extends BaseController
         System.out.println("getInfo 菜单权限加载结束");
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
+        ajax.put("dept",sysDept);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
         return ajax;
@@ -857,19 +860,19 @@ public class SysUserController extends BaseController
         }
         userService.updateUser(user);
         // 审批表删除部门分组数据()
-        if(list.size() > 0){
-            String deptId = CommonUtil.objToString(list.get(0).getSucrDeptId());
-            Map<String, Object> flowableRes = flowableService.deleteFlowableUserGroup(String.valueOf(user.getUserId()), deptId);
-            if (!"200".equals(flowableRes.get("code"))) {
-                throw new Exception("审批数据删除部门分组失败!");
-            }
-        }
+//        if(list.size() > 0){
+//            String deptId = CommonUtil.objToString(list.get(0).getSucrDeptId());
+//            Map<String, Object> flowableRes = flowableService.deleteFlowableUserGroup(String.valueOf(user.getUserId()), deptId);
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据删除部门分组失败!");
+//            }
+//        }
         //审批表增加部门分组数据
-        SysDept dept = deptMapper.selectDeptById(user.getDeptId());
-        Map<String, Object> flowableRes = flowableService.addFlowableUser(String.valueOf(user.getUserId()), user.getNickName(), dept.getAlternateNumber());
-        if (!"200".equals(flowableRes.get("code"))) {
-            throw new Exception("审批数据新增失败!");
-        }
+//        SysDept dept = deptMapper.selectDeptById(user.getDeptId());
+//        Map<String, Object> flowableRes = flowableService.addFlowableUser(String.valueOf(user.getUserId()), user.getNickName(), dept.getAlternateNumber());
+//        if (!"200".equals(flowableRes.get("code"))) {
+//            throw new Exception("审批数据新增失败!");
+//        }
         return AjaxResult.success();
     }
 

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysRoleServiceImpl.java

@@ -70,7 +70,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         {
             if (StringUtils.isNotNull(perm))
             {
-                permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
+                permsSet.addAll(Arrays.asList(perm.getRoleName().trim().split(",")));
             }
         }
         return permsSet;