bug fix

src/main/java/com/horizon/custom/GroupOrPositionUtil.java

@@ -46,10 +46,11 @@ public class GroupOrPositionUtil {
             Map<String, String> userMap = organization.getUserById(userId, HorizonCore.TENANT_IDENTIFIER.value());
             String deptId = userMap.get("dept_id");
             String fDeptId =  GroupOrPositionUtil.queryFDept(deptId);
-
+            LOGGER.info("deptId:{}_fDeptId:{}", deptId, fDeptId);
             // 对比用户所属部门，如果相同，则添加到userIds中
             for (Map<String, String> user : userByIDs) {
                 String fDeptIdTmp =  GroupOrPositionUtil.queryFDept(user.get("dept_id"));
+                LOGGER.info("deptId:{}_fDeptIdTmp:{}_fDeptIdTmp:{}", user.get("dept_id"), fDeptIdTmp, fDeptId);
                 if (fDeptIdTmp.equals(fDeptId)) {
                     userIds += user.get("id") + "/" + orgId + ";";
                     LOGGER.info("获取到{}里同步人员id:{}", orgId, user.get("id"));
@@ -101,9 +102,6 @@ public class GroupOrPositionUtil {
 
     public static String queryFDept(String deptId){
         // 机关部门，不取父ID，直接返回
-        if(deptId.startsWith("D0101")){
-            return deptId;
-        }
         //D0110  D011003 质计中心
         //D0101  D010101机关
         String dbIdentifier = "jl_sgiip";
@@ -116,9 +114,15 @@ public class GroupOrPositionUtil {
 
 
         String fDeptId = (String) resmap.get("f_id");
+        String deptCode= (String) resmap.get("dept_code");
 
         if(fDeptId.length() > 4){
             fDeptId = fDeptId.substring(0, 5); // 截取前5位
+        } else {
+            fDeptId = deptCode;
+        }
+        if(deptCode.startsWith("D0101")){
+            return deptCode;
         }
         return fDeptId;
     }