已授权用户查询部门详情

src/main/java/com/cmeeting/dto/PermissionCheckedDTO.java

@@ -31,6 +31,7 @@ public class PermissionCheckedDTO implements Serializable {
         private String id;
         private Integer userType;
         private String name;
+        private String deptId;
         private String deptName;
         private Boolean check = false;
     }

src/main/java/com/cmeeting/service/SysUserSyncService.java

@@ -50,4 +50,6 @@ public interface SysUserSyncService extends IService<SysUserSync> {
     List<SysUserSyncCategory> getTreeList();
 
     void downloadTree(List<SysUserSyncCategory> list, HttpServletResponse response);
+
+    String getDeptPathName(String path, String deptId);
 }

src/main/java/com/cmeeting/service/impl/ModulePermissionServiceImpl.java

@@ -100,8 +100,9 @@ public class ModulePermissionServiceImpl extends ServiceImpl<ModulePermissionMap
             if (CollUtil.isNotEmpty(permissionCheckedDTO.getUserList())) {
                 for (PermissionCheckedDTO.User user : permissionCheckedDTO.getUserList()) {
                     if (userIds.contains(user.getId())) {
+                        String deptPath = iSysUserSyncService.getDeptPathName("", user.getDeptId());
                         PermissionCheckedDTO.CateOrUser cateOrUser = PermissionCheckedDTO.CateOrUser.builder()
-                                .id(user.getId()).name(user.getName()).deptName(user.getDeptName()).userType(user.getUserType()).type(RecordTemplateConstant.REL_TYPE_USER).build();
+                                .id(user.getId()).name(user.getName()).deptName(deptPath).userType(user.getUserType()).type(RecordTemplateConstant.REL_TYPE_USER).build();
                         retList.add(cateOrUser);
                     }
                 }
@@ -109,8 +110,9 @@ public class ModulePermissionServiceImpl extends ServiceImpl<ModulePermissionMap
             if (CollUtil.isNotEmpty(permissionCheckedDTO.getCategoryList())) {
                 for (PermissionCheckedDTO.Category category : permissionCheckedDTO.getCategoryList()) {
                     if (cateIds.contains(category.getId())) {
+                        String deptPath = iSysUserSyncService.getDeptPathName("", category.getId());
                         PermissionCheckedDTO.CateOrUser cateOrUser = PermissionCheckedDTO.CateOrUser.builder()
-                                .id(category.getId()).name(category.getName()).deptName(category.getName()).userType(category.getUserType()).type(RecordTemplateConstant.REL_TYPE_DEPT).build();
+                                .id(category.getId()).name(category.getName()).deptName(deptPath).userType(category.getUserType()).type(RecordTemplateConstant.REL_TYPE_DEPT).build();
                         retList.add(cateOrUser);
                     }
                 }

src/main/java/com/cmeeting/service/impl/SysUserSyncServiceImpl.java

@@ -99,6 +99,21 @@ public class SysUserSyncServiceImpl extends ServiceImpl<SysUserSyncMapper, SysUs
         return getDeptPath("/" + parentDeptId + deptPath, parentDeptId);
     }
 
+    public String getDeptPathName(String path, String deptId) {
+        if (StrUtil.isBlank(deptId) || CategoryConstant.ROOT_ID.equals(deptId)) {
+            return path;
+        }
+        SysUserSyncCategory sysUserSyncCategory = iSysUserSyncCategoryService.getOne(new LambdaQueryWrapper<SysUserSyncCategory>()
+                .eq(SysUserSyncCategory::getDeptId, deptId)
+                .select(SysUserSyncCategory::getDeptId, SysUserSyncCategory::getName, SysUserSyncCategory::getParentId)
+                .last("limit 1"));
+        if (sysUserSyncCategory == null) {
+            return path;
+        }
+
+        return getDeptPathName("/" + sysUserSyncCategory.getName() + path, sysUserSyncCategory.getParentId());
+    }
+
 
     /**
      * 向上获取部门集合，包含当前部门

src/main/resources/mapper/primary/SysUserSyncMapper.xml

@@ -39,7 +39,7 @@
         FROM sys_user_sync_category AS susc
     </select>
     <select id="findName" resultType="com.cmeeting.dto.PermissionCheckedDTO$User">
-        select distinct t1.user_id as id,t1.name,t2.name as deptName
+        select distinct t1.user_id as id, t1.name, t2.dept_id as deptId, t2.name as deptName
         from sys_user_sync t1
         left join sys_user_sync_category t2 on t1.dept_id = t2.dept_id
         <where>