统计日志小改动-部门显示全部信息

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

@@ -20,4 +20,6 @@ public interface ISysUserSyncCategoryService extends IService<SysUserSyncCategor
     List<Tree<String>> tree(String tenantId);
 
     List<SysUserSyncCategory> selectParentIdNoInId(String search);
+
+    String getPathName(String deptId, Map<String, String> parentIdMap, Map<String, String> nameMap);
 }

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

@@ -34,7 +34,9 @@ import com.cmeeting.mapper.primary.UserIdMapper;
 import com.cmeeting.mapper.primary.SysUserSyncMapper;
 import com.cmeeting.pojo.MeetingInfo;
 import com.cmeeting.pojo.MeetingRecordTemplate;
+import com.cmeeting.pojo.SysUserSyncCategory;
 import com.cmeeting.pojo.UserId;
+import com.cmeeting.service.ISysUserSyncCategoryService;
 import com.cmeeting.service.MeetingInfoService;
 import com.cmeeting.service.SysUserSyncService;
 import com.cmeeting.util.AESUtils;
@@ -113,6 +115,8 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
 
     @Resource
     private SysUserSyncService sysUserSyncService;
+    @Resource
+    private ISysUserSyncCategoryService iSysUserSyncCategoryService;
 
     @Override
     public IPage<MeetingInfo> getPage(MeetingInfoVO vo) {
@@ -304,6 +308,17 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
         List<String> userIdList = statisticsList.stream().map(map -> map.get("userId")).collect(Collectors.toList());
         List<Map<String, String>> userInfoList = sysUserSysMapper.selectParamByUserIdList(searchValue, userIdList);
 
+        if (CollUtil.isNotEmpty(userInfoList)) {
+            List<SysUserSyncCategory> categoryList = iSysUserSyncCategoryService.list(new LambdaQueryWrapper<SysUserSyncCategory>().select(SysUserSyncCategory::getDeptId, SysUserSyncCategory::getParentId, SysUserSyncCategory::getName));
+            Map<String, String> parentIdMap = categoryList.stream().collect(Collectors.toMap(SysUserSyncCategory::getDeptId, SysUserSyncCategory::getParentId));
+            Map<String, String> nameMap = categoryList.stream().collect(Collectors.toMap(SysUserSyncCategory::getDeptId, SysUserSyncCategory::getName));
+            for (Map<String, String> map : userInfoList) {
+                String deptId = map.get("deptId");
+                String pathName = iSysUserSyncCategoryService.getPathName(deptId, parentIdMap, nameMap);
+                map.put("deptName", pathName);
+            }
+        }
+
         for (Map<String, String> userInfo : userInfoList) {
             String userId = userInfo.get("userId");
             statisticsList.stream().filter(statistics -> statistics.get("userId").equals(userId)).findFirst().ifPresent(userInfo::putAll);

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

@@ -58,4 +58,15 @@ public class SysUserSyncCategoryServiceImpl extends ServiceImpl<SysUserSyncCateg
     public List<SysUserSyncCategory> selectParentIdNoInId(String search) {
         return baseMapper.selectParentIdNoInId(search);
     }
+
+    @Override
+    public String getPathName(String deptId, Map<String, String> parentIdMap, Map<String, String> nameMap) {
+        if (parentIdMap.get(deptId) == null) {
+            return "";
+        }
+        if (parentIdMap.get(deptId).equals(CategoryConstant.ROOT_ID)) {
+            return CategoryConstant.ROOT_PATH + nameMap.get(deptId);
+        }
+        return getPathName(parentIdMap.get(deptId), parentIdMap, nameMap) + CategoryConstant.ROOT_PATH + nameMap.get(deptId);
+    }
 }

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

@@ -137,7 +137,7 @@
 
     <select id="selectParamByUserIdList" resultType="java.util.LinkedHashMap">
         SELECT
-        sys_user_sync_category.`name` as deptName,
+        sys_user_sync_category.`dept_id` as deptId,
         sys_user_sync.`name`,
         sys_user_sync.user_id as userId
         FROM