个人用户画像处理

airport-admin/src/main/java/com/sundot/airport/web/controller/score/DeptPortraitController.java

@@ -195,7 +195,7 @@ public class DeptPortraitController extends BaseController {
      */
     @ApiOperation("清空所有画像缓存")
     @PostMapping("/clear-cache")
-    @CacheEvict(value = {"dept:members", "dept:distribution", "dept:position", "portrait", "station:stats", "team:stats"}, allEntries = true)
+    @CacheEvict(value = {"dept:members", "dept:distribution", "dept:position", "portrait", "station:stats", "team:stats","dept_user_tree"}, allEntries = true)
     public AjaxResult clearPortraitCache() {
         return success("缓存已清空");
     }

airport-common/src/main/java/com/sundot/airport/common/utils/DateUtils.java

@@ -35,7 +35,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     private static String[] parsePatterns = {
             "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
-            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM",
+            "yyyy"};
 
     /**
      * 获取当前Date型日期
@@ -207,4 +208,4 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
                 cal.get(Calendar.MONTH) + 1,
                 cal.get(Calendar.DAY_OF_MONTH));
     }
-}
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/EmployeePortraitServiceImpl.java

@@ -2,6 +2,7 @@ package com.sundot.airport.ledger.service.impl;
 
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.DeptTypeEnum;
 import com.sundot.airport.common.enums.ScoreLevelEnum;
 import com.sundot.airport.ledger.domain.LedgerExamScore;
 import com.sundot.airport.ledger.domain.ScoreDimension;
@@ -206,6 +207,7 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         vo.setSecurityInspectionPosition(user.getSecurityInspectionPosition());
         vo.setUserTags(user.getTags());
 
+
         // 司龄、工龄、开机年限
         long nowMs = System.currentTimeMillis();
         if (user.getStartWorkingDate() != null) {
@@ -251,15 +253,45 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         // 部门路径
         if (user.getDept() != null) {
             String deptName = user.getDept().getDeptName();
-            String parentDeptName = "";
-            Long parentId = user.getDept().getParentId();
-            if (parentId != null && parentId > 0) {
-                SysDept parent = sysDeptMapper.selectDeptById(parentId);
-                if (parent != null) parentDeptName = parent.getDeptName();
+            //根据名称查询部门
+            SysDept dept = sysDeptMapper.selectDeptById(user.getDept().getDeptId());
+            // 祖先ID批量查询
+            List<Long> ancestorIds = new ArrayList<>();
+            if (dept.getAncestors() != null) {
+                for (String id : dept.getAncestors().split(",")) {
+                    Long deptId = Long.parseLong(id.trim());
+                    if (deptId > 0) ancestorIds.add(deptId);
+                }
+            }
+            
+            // 一次查询所有祖先部门
+            Map<Long, SysDept> deptMap = ancestorIds.isEmpty() ? new HashMap<>() 
+                : sysDeptMapper.selectDeptByIdList(ancestorIds).stream()
+                    .collect(Collectors.toMap(SysDept::getDeptId, d -> d));
+            
+            // 构建路径（从BRIGADE到当前部门）
+            List<String> path = new ArrayList<>();
+            String currentDeptType = dept.getDeptType();
+            if (!DeptTypeEnum.MANAGER.getCode().equals(currentDeptType) && !DeptTypeEnum.TEAMS.getCode().equals(currentDeptType)) {
+                path.add(deptName);
+            } else {
+                // 从BRIGADE级别开始构建路径
+                for (Long id : ancestorIds) {
+                    SysDept d = deptMap.get(id);
+                    if (d != null) {
+                        if (DeptTypeEnum.BRIGADE.getCode().equals(d.getDeptType())) path.clear();
+                        path.add(d.getDeptName());
+                    }
+                }
+                path.add(deptName);
             }
+            
             vo.setDeptName(deptName);
-            vo.setParentDeptName(parentDeptName);
-            vo.setDeptPath(parentDeptName.isEmpty() ? deptName : parentDeptName + "/" + deptName);
+            vo.setParentDeptName(ancestorIds.isEmpty() ? "" : 
+                Optional.ofNullable(deptMap.get(dept.getParentId()))
+                    .orElseGet(() -> sysDeptMapper.selectDeptById(dept.getParentId()))
+                    .getDeptName());
+            vo.setDeptPath(String.join("/", path));
         }
     }
 
@@ -507,4 +539,4 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         });
         return result;
     }
-}
+}