bug fix

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

@@ -0,0 +1,33 @@
+package com.horizon.custom;
+
+import com.horizon.wf.core.rule.BaseRuleImpl;
+import com.horizon.wf.core.rule.IBaseRule;
+import com.horizon.wf.definition.pub.IFlowNode;
+import com.horizon.wf.global.StaticVarExtend;
+
+/**
+ * 根据组织机构里的群组或者岗位，与流程创建者做交集
+ * com.horizon.custom.CreatorPositionDeptIntersectionResolver
+ */
+public class CreatorPositionDeptIntersectionResolver extends BaseRuleImpl implements IBaseRule {
+    @Override
+    public boolean executeRule() {
+        // 3. 获取办理人的节点定义对象
+        IFlowNode flowNode = (IFlowNode) getParameter(StaticVarExtend.Parameter_CustomeUser_IFlowNode);
+        // 获取主办中设置的id
+        String groups[] = flowNode.getParticipantsUserList().get(1).getGroup().split(";");
+        String positions[] = flowNode.getParticipantsUserList().get(1).getPosition().split(";");
+        // 5. 获取的办理人返回
+        String userId = "";
+        // 获取流程创建人id
+        String creator = getRunningdata().getWork().getCreator();
+        // 获取群组与用户所属部门交集
+        userId += GroupOrPositionUtil.getUserBySameDeptAndOrgResolver(groups, creator) + ";";
+        // 获取岗位与用户所属部门交集
+        userId += GroupOrPositionUtil.getUserBySameDeptAndOrgResolver(positions, creator) + ";";
+        setResult(userId);
+        return true;
+    }
+
+
+}

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

@@ -1,41 +0,0 @@
-package com.horizon.custom;
-
-import com.horizon.common.collect.Lists;
-import com.horizon.db.Access;
-import com.horizon.wf.core.rule.BaseRuleImpl;
-import com.horizon.wf.core.rule.IBaseRule;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 根据组织机构里的群组或者岗位，与流程创建者做交集
- * com.horizon.custom.GroupOrPositionCreator
- */
-public class GroupCreator extends BaseRuleImpl implements IBaseRule {
-    @Override
-    public boolean executeRule() {
-        String userId = "";
-        // 获取流程创建人id
-        String creator = getRunningdata().getWork().getCreator();
-
-        String dbIdentifier = "shindi";
-
-        // 获取组长ID
-        String queryGroupIdSql =
-                "SELECT z.EMP_NO AS GROUP_ID " +
-                "FROM SHINDI.T_COST_BANK_ACCOUNT z " +
-                "WHERE z.SUB_PARK = (SELECT Z.SUB_PARK FROM SHINDI.T_COST_BANK_ACCOUNT Z WHERE Z.EMP_NO = ?)" +
-                "AND z.IS_EXAM = '0'";
-
-        List<String> list = Lists.newArrayList();
-        // 参数传递
-        list.add(creator);
-        Map resmap = Access.getSingleMap(queryGroupIdSql, list, dbIdentifier);
-        userId = (String) resmap.get("group_id");
-
-        setResult(userId);
-        return true;
-    }
-
-}

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

@@ -0,0 +1,133 @@
+package com.horizon.custom;
+
+import com.horizon.core.HorizonCore;
+import com.horizon.third.adapter.OrganizationAdapter;
+import com.horizon.third.build.OrgDataBuilderHolder;
+import com.horizon.third.entity.OrgData;
+import com.horizon.third.entity.User;
+import com.horizon.utils.StringUtil;
+import com.horizon.wf.core.rule.BaseRuleImpl;
+import com.horizon.wf.core.rule.IBaseRule;
+import com.horizon.wf.core.runtime.RunningData;
+import com.horizon.wf.definition.pub.IFlowNode;
+import com.horizon.wf.global.StaticVarExtend;
+
+import java.util.*;
+
+/**
+ * 根据组织机构里的群组或者岗位，与流程创建者做交集
+ * com.horizon.custom.GroupOrPositionCreator
+ */
+public class GroupOrPositionByDeptVarsLimit6 extends BaseRuleImpl implements IBaseRule {
+    @Override
+    public boolean executeRule() {
+        RunningData runningdata = getRunningdata();
+        Map<String, String> flowVar = runningdata.getFlowVar().getAllFlowVarMap();
+
+        // 3. 获取办理人的节点定义对象
+        IFlowNode flowNode = (IFlowNode) getParameter(StaticVarExtend.Parameter_CustomeUser_IFlowNode);
+        // 获取主办中设置的id
+        String groups[] = flowNode.getParticipantsUserList().get(1).getGroup().split(";");
+        String positions[] = flowNode.getParticipantsUserList().get(1).getPosition().split(";");
+//        String depts[] = flowNode.getParticipantsUserList().get(1).getDept().split(";");
+//
+//        // 获取业务传入的参数变量
+//        String customDept = flowVar.get("customDept");
+//        if(StringUtil.hasValue(customDept)){
+//            depts = customDept.split(";");
+//        }
+
+        String[] originalDepts = flowNode.getParticipantsUserList().get(1).getDept().split(";");
+        Set<String> deptSet = new LinkedHashSet<>(Arrays.asList(originalDepts)); // 保持顺序并去重
+
+        String customDept = flowVar.get("customDept");
+        if (StringUtil.hasValue(customDept)) {
+            deptSet.addAll(Arrays.asList(customDept.split(";")));
+        }
+
+        String[] depts = deptSet.toArray(new String[0]);
+
+        // 获取岗位与部门交集+传入部门的交集
+
+        // 获取岗位与用户所属部门交集
+
+        String userId = "";
+
+        if(depts.length > 0){
+
+            userId += this.getUserBySameDeptAndOrg(positions, depts) + ";";
+        }
+
+        setResult(userId);
+        return true;
+    }
+
+    public String getUserBySameDeptAndOrg(String orgIds[], String[] depts) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+        // 最终办理人用户id
+        StringBuilder userIds = new StringBuilder();
+        // 获取群组下的所有用户信息
+        if (orgIds.length < 1) return "";
+        for (String orgId : orgIds) {
+            String orgUserIds = "";
+            // 获取群组下的所有用户id
+            if (orgId.contains("G_")) {
+                orgUserIds = organization.getAllUserFromGroup(orgId.replace("G_", ""), HorizonCore.TENANT_IDENTIFIER.value());
+            } else if (orgId.contains("P_")) {
+                orgUserIds = organization.getAllUserFromPosition(orgId.replace("P_", ""), HorizonCore.TENANT_IDENTIFIER.value());
+            }
+            if (!StringUtil.hasValue(orgUserIds)) return "";
+
+            List<User> userList = new ArrayList<>();
+            for (String userId : orgUserIds.split(";")) {
+                User user = OrgDataBuilderHolder.getBuilder().getUserById(userId);
+                userList.add(user);
+            }
+
+            // 根据多个用户id，获取用户信息
+//            List<Map<String, String>> userByIDs = organization.getUserByIDs(orgUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
+
+            // 对比用户所属部门，如果相同，则添加到userIds中
+            for (User user : userList) {
+                List<String> deptList = user.getDepartment();
+                for (int i = 0; i < deptList.size(); i++) {
+                    if (!deptList.get(i).startsWith("D_")) {
+                        deptList.set(i, "D_" + deptList.get(i));
+                    }
+                }
+
+                boolean hasIntersection = judgeDeptJoinLimit6(deptList, Arrays.asList(depts));
+                if (hasIntersection) {
+                    userIds.append(user.getId()).append("/").append(orgId).append(";");
+                }
+            }
+        }
+        return userIds.toString();
+    }
+
+    public boolean judgeDeptJoinLimit6(List<String> deptIdList1, List<String> deptIdList2) {
+        List<String> deptIdListLimit6_1 = new ArrayList<>();
+        List<String> deptIdListLimit6_2 = new ArrayList<>();
+
+        for(String deptId : deptIdList1){
+            if(deptId.startsWith("D_")){
+                OrgData orgData = OrgDataBuilderHolder.getBuilder().getOrgDataById("D", deptId.substring(2));
+                if(orgData != null && orgData.getCode().length() > 6){
+                    deptIdListLimit6_1.add(orgData.getCode().substring(0, 7));
+                }
+            }
+        }
+
+        for(String deptId : deptIdList2){
+            if(deptId.startsWith("D_")){
+                OrgData orgData = OrgDataBuilderHolder.getBuilder().getOrgDataById("D", deptId.substring(2));
+                if(orgData != null && orgData.getCode().length() > 6){
+                    deptIdListLimit6_2.add(orgData.getCode().substring(0, 7));
+                }
+            }
+        }
+
+        return !Collections.disjoint(deptIdListLimit6_1, deptIdListLimit6_2);
+    }
+
+}

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

@@ -2,6 +2,8 @@ package com.horizon.custom;
 
 import com.horizon.core.HorizonCore;
 import com.horizon.third.adapter.OrganizationAdapter;
+import com.horizon.third.build.OrgDataBuilderHolder;
+import com.horizon.third.entity.User;
 import com.horizon.utils.StringUtil;
 import com.horizon.wf.core.rule.BaseRuleImpl;
 import com.horizon.wf.core.rule.IBaseRule;
@@ -50,7 +52,7 @@ public class GroupOrPositionByVars extends BaseRuleImpl implements IBaseRule {
 
         String userId = "";
 
-        if(depts.length > 0){
+        if (depts.length > 0) {
             userId += this.getUserBySameDeptAndOrg(positions, depts) + ";";
         }
 
@@ -61,7 +63,7 @@ public class GroupOrPositionByVars extends BaseRuleImpl implements IBaseRule {
     public String getUserBySameDeptAndOrg(String orgIds[], String[] depts) {
         OrganizationAdapter organization = new OrganizationAdapter();
         // 最终办理人用户id
-        String userIds = "";
+        StringBuilder userIds = new StringBuilder();
         // 获取群组下的所有用户信息
         if (orgIds.length < 1) return "";
         for (String orgId : orgIds) {
@@ -73,18 +75,35 @@ public class GroupOrPositionByVars extends BaseRuleImpl implements IBaseRule {
                 orgUserIds = organization.getAllUserFromPosition(orgId.replace("P_", ""), HorizonCore.TENANT_IDENTIFIER.value());
             }
             if (!StringUtil.hasValue(orgUserIds)) return "";
+
+            List<User> userList = new ArrayList<>();
+            for (String userId : orgUserIds.split(";")) {
+                User user = OrgDataBuilderHolder.getBuilder().getUserById(userId);
+                userList.add(user);
+            }
+
             // 根据多个用户id，获取用户信息
-            List<Map<String, String>> userByIDs = organization.getUserByIDs(orgUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
+//            List<Map<String, String>> userByIDs = organization.getUserByIDs(orgUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
 
             // 对比用户所属部门，如果相同，则添加到userIds中
-            for (Map<String, String> user : userByIDs) {
-                String deptId = "D_" + user.get("dept_id");
-                if (Arrays.asList(depts).contains(deptId)) {
-                    userIds += user.get("id") + "/" + orgId + ";";
+            for (User user : userList) {
+                List<String> deptList = user.getDepartment();
+                if (deptList == null) {
+                    continue;
+                }
+                for (int i = 0; i < deptList.size(); i++) {
+                    if (!deptList.get(i).startsWith("D_")) {
+                        deptList.set(i, "D_" + deptList.get(i));
+                    }
+                }
+
+                boolean hasIntersection = !Collections.disjoint(deptList, Arrays.asList(depts));
+                if (hasIntersection) {
+                    userIds.append(user.getId()).append("/").append(orgId).append(";");
                 }
             }
         }
-        return userIds;
+        return userIds.toString();
     }
 
 

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

@@ -4,10 +4,15 @@ import com.horizon.common.collect.Lists;
 import com.horizon.core.HorizonCore;
 import com.horizon.db.Access;
 import com.horizon.third.adapter.OrganizationAdapter;
+import com.horizon.third.build.OrgDataBuilderHolder;
+import com.horizon.third.entity.OrgData;
+import com.horizon.third.entity.User;
 import com.horizon.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -44,13 +49,15 @@ public class GroupOrPositionUtil {
             List<Map<String, String>> userByIDs = organization.getUserByIDs(orgUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
             // 根据userid获取用户信息
             Map<String, String> userMap = organization.getUserById(userId, HorizonCore.TENANT_IDENTIFIER.value());
+            System.err.println("用户：" + userId);
             String deptId = userMap.get("dept_id");
-            String fDeptId =  GroupOrPositionUtil.queryFDept(deptId);
-            LOGGER.info("deptId:{}_fDeptId:{}", deptId, fDeptId);
+            System.err.println("用户部门：" + deptId);
+
+            String fDeptId = GroupOrPositionUtil.queryFDept(deptId);
+
             // 对比用户所属部门，如果相同，则添加到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);
+                String fDeptIdTmp = GroupOrPositionUtil.queryFDept(user.get("dept_id"));
                 if (fDeptIdTmp.equals(fDeptId)) {
                     userIds += user.get("id") + "/" + orgId + ";";
                     LOGGER.info("获取到{}里同步人员id:{}", orgId, user.get("id"));
@@ -60,8 +67,6 @@ public class GroupOrPositionUtil {
         return userIds;
     }
 
-
-
     /**
      * 获取userid所属部门，与设置的群组/岗位 下的人同部门的用户
      *
@@ -72,7 +77,7 @@ public class GroupOrPositionUtil {
     public static String getUserBySameDeptAndOrg(String orgIds[], String userId) {
         OrganizationAdapter organization = new OrganizationAdapter();
         // 最终办理人用户id
-        String userIds = "";
+        StringBuilder userIds = new StringBuilder();
         // 获取群组下的所有用户信息
         if (orgIds.length < 1) return "";
         for (String orgId : orgIds) {
@@ -84,20 +89,52 @@ public class GroupOrPositionUtil {
                 orgUserIds = organization.getAllUserFromPosition(orgId.replace("P_", ""), HorizonCore.TENANT_IDENTIFIER.value());
             }
             if (!StringUtil.hasValue(orgUserIds)) return "";
-            // 根据多个用户id，获取用户信息
-            List<Map<String, String>> userByIDs = organization.getUserByIDs(orgUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
-            // 根据userid获取用户信息
-            Map<String, String> userMap = organization.getUserById(userId, HorizonCore.TENANT_IDENTIFIER.value());
-            String deptId = userMap.get("dept_id");
-            // 对比用户所属部门，如果相同，则添加到userIds中
-            for (Map<String, String> user : userByIDs) {
-                if (user.get("dept_id").equals(deptId)) {
-                    userIds += user.get("id") + "/" + orgId + ";";
-                    LOGGER.info("获取到{}里同步人员id:{}", orgId, user.get("id"));
+
+            List<User> userList = new ArrayList<>();
+            for (String userIdTmp : orgUserIds.split(";")) {
+                User user = OrgDataBuilderHolder.getBuilder().getUserById(userIdTmp);
+                userList.add(user);
+            }
+
+            User CurrentUser = OrgDataBuilderHolder.getBuilder().getUserById(userId);
+            List<String> deptIds = CurrentUser.getDepartment();
+
+            for (int i = 0; i < deptIds.size(); i++) {
+                if (!deptIds.get(i).startsWith("D_")) {
+                    deptIds.set(i, "D_" + deptIds.get(i));
                 }
             }
+
+
+//            // 根据多个用户id，获取用户信息
+//            List<Map<String, String>> userByIDs = organization.getUserByIDs(orgUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
+//            // 根据userid获取用户信息
+//            Map<String, String> userMap = organization.getUserById(userId, HorizonCore.TENANT_IDENTIFIER.value());
+
+
+            for (User user : userList) {
+                List<String> deptList = user.getDepartment();
+
+                if (deptList == null) {
+                    continue;
+                }
+                for (int i = 0; i < deptList.size(); i++) {
+                    if (!deptList.get(i).startsWith("D_")) {
+                        deptList.set(i, "D_" + deptList.get(i));
+                    }
+                }
+
+                LOGGER.info("deptList:{},deptIds:{}", deptList.toString(), deptIds.toString());
+
+                boolean hasIntersection = !Collections.disjoint(deptList, deptIds);
+                if (hasIntersection) {
+                    userIds.append(user.getId()).append("/").append(orgId).append(";");
+                    LOGGER.info("获取到{}里同步人员id:{}", orgId, user.getId());
+                }
+            }
+
         }
-        return userIds;
+        return userIds.toString();
     }
 
     public static String queryFDept(String deptId){
@@ -126,4 +163,122 @@ public class GroupOrPositionUtil {
         }
         return fDeptId;
     }
+
+
+    /**
+     * 获取userid所属部门，与设置的群组/岗位 下的人同部门的用户
+     *
+     * @param orgIds
+     * @param userId
+     * @return
+     */
+    public static String getUserBySameDeptAndOrgResolver(String orgIds[], String userId) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+        // 最终办理人用户id
+        StringBuilder userIds = new StringBuilder();
+        int lenDiff = 0;
+        // 获取群组下的所有用户信息
+        if (orgIds.length < 1) return "";
+//        for (String orgId : orgIds) {
+//            String orgUserIds = "";
+//            // 获取群组下的所有用户id
+//            if (orgId.contains("G_")) {
+//                orgUserIds = organization.getAllUserFromGroup(orgId.replace("G_", ""), HorizonCore.TENANT_IDENTIFIER.value());
+//            } else if (orgId.contains("P_")) {
+//                orgUserIds = organization.getAllUserFromPosition(orgId.replace("P_", ""), HorizonCore.TENANT_IDENTIFIER.value());
+//            }
+//            if (!StringUtil.hasValue(orgUserIds)) return "";
+//
+//            List<User> userList = new ArrayList<>();
+//            for (String userIdTmp : orgUserIds.split(";")) {
+//                User user = OrgDataBuilderHolder.getBuilder().getUserById(userIdTmp);
+//                userList.add(user);
+//            }
+//
+//            User CurrentUser = OrgDataBuilderHolder.getBuilder().getUserById(userId);
+//            List<String> deptIds = CurrentUser.getDepartment();
+//
+//            for (int i = 0; i < deptIds.size(); i++) {
+//                if (!deptIds.get(i).startsWith("D_")) {
+//                    deptIds.set(i, "D_" + deptIds.get(i));
+//                }
+//            }
+//
+//            for (User user : userList) {
+//                List<String> deptList = user.getDepartment();
+//                for (int i = 0; i < deptList.size(); i++) {
+//                    if (!deptList.get(i).startsWith("D_")) {
+//                        deptList.set(i, "D_" + deptList.get(i));
+//                    }
+//                }
+//
+//                boolean hasIntersection = !Collections.disjoint(deptList, deptIds);
+//                if (hasIntersection) {
+//                    userIds.append(user.getId()).append("/").append(orgId).append(";");
+//                    LOGGER.info("获取到{}里同步人员id:{}", orgId, user.getId());
+//                }
+//            }
+//
+//        }
+
+        do {
+            for (String orgId : orgIds) {
+                String orgUserIds = "";
+                // 获取群组下的所有用户id
+                if (orgId.contains("G_")) {
+                    orgUserIds = organization.getAllUserFromGroup(orgId.replace("G_", ""), HorizonCore.TENANT_IDENTIFIER.value());
+                } else if (orgId.contains("P_")) {
+                    orgUserIds = organization.getAllUserFromPosition(orgId.replace("P_", ""), HorizonCore.TENANT_IDENTIFIER.value());
+                }
+                if (!StringUtil.hasValue(orgUserIds)) return "";
+
+                List<User> userList = new ArrayList<>();
+                for (String userIdTmp : orgUserIds.split(";")) {
+                    User user = OrgDataBuilderHolder.getBuilder().getUserById(userIdTmp);
+                    userList.add(user);
+                }
+
+                User CurrentUser = OrgDataBuilderHolder.getBuilder().getUserById(userId);
+                List<String> deptIds = CurrentUser.getDepartment();
+
+                for (int i = 0; i < deptIds.size(); i++) {
+                    OrgData orgData = null;
+                    if (deptIds.get(i).startsWith("D_")) {
+                        orgData = OrgDataBuilderHolder.getBuilder().getOrgDataById("D", deptIds.get(i).substring(2));
+                    } else {
+                        orgData = OrgDataBuilderHolder.getBuilder().getOrgDataById("D", deptIds.get(i));
+                    }
+                    if (orgData != null && orgData.getCode().length() > 4) {
+                        deptIds.add(orgData.getCode().substring(0, Math.max(orgData.getCode().length() - lenDiff, 1)));
+                    }
+                }
+
+
+                for (User user : userList) {
+                    List<String> deptList = user.getDepartment();
+                    for (int i = 0; i < deptList.size(); i++) {
+                        OrgData orgData = null;
+                        if (deptList.get(i).startsWith("D_")) {
+                            orgData = OrgDataBuilderHolder.getBuilder().getOrgDataById("D", deptList.get(i).substring(2));
+                        } else {
+                            orgData = OrgDataBuilderHolder.getBuilder().getOrgDataById("D", deptList.get(i));
+                        }
+                        if (orgData != null && orgData.getCode().length() > 4) {
+                            deptList.add(orgData.getCode().substring(0, Math.max(orgData.getCode().length() - lenDiff, 1)));
+                        }
+                    }
+
+                    boolean hasIntersection = !Collections.disjoint(deptList, deptIds);
+                    if (hasIntersection) {
+                        userIds.append(user.getId()).append("/").append(orgId).append(";");
+                        LOGGER.info("获取到{}里同步人员id:{}", orgId, user.getId());
+                    }
+                }
+
+            }
+            lenDiff = lenDiff + 2;
+        } while (userIds.length() == 0 && lenDiff < 5);
+        return userIds.toString();
+    }
+
 }

src/main/java/com/horizon/org/OrgBuilderImpl.java

@@ -298,6 +298,8 @@ public class OrgBuilderImpl extends OrgBuilder {
         List<Map<String, Object>> usermap = Access.getMultiMap(sql, null, dbIdentifier);
         //用户信息保存到datas集合对象中返回
         List<User> datas = Lists.newArrayList();
+        List<String> ids = Lists.newArrayList();
+
         for (Map<String, Object> map : usermap) {
             String id = map.get("id") == null ? "" : map.get("id").toString();
             String name = map.get("name") == null ? "" : map.get("name").toString();
@@ -306,23 +308,35 @@ public class OrgBuilderImpl extends OrgBuilder {
 
             //处理用户所属部门，可以所属多个部门
             List<String> listDept = Lists.newArrayList(deptid);
-//            listDept.add(deptid);
-            //用户信息保存到User类的对象中
-            User u = new User();
-            u.setId(id);
-            u.setUserName(name);
-            u.setLoginName(loginName);
-            u.setPasswd("1234");//密码，一般设置默认统一的密码
-            u.setDepartment(listDept);
-            u.setOrderNo(1);//用户排序，可选
-
-            if(Objects.equals(id, "24F955A08CD8CDECE063040011AC9F7F") && listDept.contains("25855EBF0D906250E063040011ACA98F")){
-                u.setOperType("F");//用户类型（F：直接部门领导，C：上级主管领导，I：部门管理员，空：一般用户，可传多值，多值用;隔开）
-            }else {
-                u.setOperType("");//用户类型（F：直接部门领导，C：上级主管领导，I：部门管理员，空：一般用户，可传多值，多值用;隔开）
+
+            if(ids.contains(id)){
+                for (User user: datas){
+                    if(user.getId().equals(id)){
+                        listDept = user.getDepartment();
+                        listDept.add(deptid);
+                        user.setDepartment(listDept);
+                    }
+                }
+            } else {
+                ids.add(id);
+                //用户信息保存到User类的对象中
+                User u = new User();
+                u.setId(id);
+                u.setUserName(name);
+                u.setLoginName(loginName);
+                u.setPasswd("1234");//密码，一般设置默认统一的密码
+                u.setDepartment(listDept);
+                u.setOrderNo(1);//用户排序，可选
+
+                if(Objects.equals(id, "24F955A08CD8CDECE063040011AC9F7F") && listDept.contains("25855EBF0D906250E063040011ACA98F")){
+                    u.setOperType("F");//用户类型（F：直接部门领导，C：上级主管领导，I：部门管理员，空：一般用户，可传多值，多值用;隔开）
+                }else {
+                    u.setOperType("");//用户类型（F：直接部门领导，C：上级主管领导，I：部门管理员，空：一般用户，可传多值，多值用;隔开）
+                }
+                datas.add(u);
             }
-            datas.add(u);
         }
+
         return datas;
     }
 }