新增规则-发起人和岗位取部门交集

src/main/java/com/horizon/common/constant/Constants.java

@@ -13,9 +13,9 @@ public class Constants {
      */
     // public static final String WF_PRE_URL = "http://172.16.7.51:10034/jlyypt";
     // 金岭
-    // public static final String WF_PRE_URL = "http://10.198.1.18:8003";
+     public static final String WF_PRE_URL = "http://10.198.1.18:8003";
     // 安全
-    public static final String WF_PRE_URL = "http://10.19.13.206/gateway";
+//    public static final String WF_PRE_URL = "http://10.19.13.206/gateway";
     public static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(10);
 
 }

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

@@ -0,0 +1,41 @@
+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/GroupOrPositionByVars.java

@@ -0,0 +1,91 @@
+package com.horizon.custom;
+
+import com.horizon.core.HorizonCore;
+import com.horizon.third.adapter.OrganizationAdapter;
+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 GroupOrPositionByVars 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
+        String userIds = "";
+        // 获取群组下的所有用户信息
+        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 "";
+            // 根据多个用户id，获取用户信息
+            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 + ";";
+                }
+            }
+        }
+        return userIds;
+    }
+
+
+}

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

@@ -1,18 +1,10 @@
 package com.horizon.custom;
 
-import com.horizon.core.HorizonCore;
-import com.horizon.third.adapter.OrganizationAdapter;
-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.Arrays;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 根据组织机构里的群组或者岗位，与流程创建者做交集
  * com.horizon.custom.GroupOrPositionCreator
@@ -20,70 +12,22 @@ import java.util.Map;
 public class GroupOrPositionCreator extends BaseRuleImpl implements IBaseRule {
     @Override
     public boolean executeRule() {
-        //3. 获取办理人的节点定义对象
+        // 3. 获取办理人的节点定义对象
         IFlowNode flowNode = (IFlowNode) getParameter(StaticVarExtend.Parameter_CustomeUser_IFlowNode);
-        //获取主办中设置的id
+        // 获取主办中设置的id
         String groups[] = flowNode.getParticipantsUserList().get(1).getGroup().split(";");
         String positions[] = flowNode.getParticipantsUserList().get(1).getPosition().split(";");
-        //5. 获取的办理人返回
+        // 5. 获取的办理人返回
         String userId = "";
-
-        //获取群组与用户所属部门交集
-        if(StringUtil.hasValue(Arrays.toString(groups))){
-            userId += getUserBySameDeptAndGroup(groups)+";";
-        }
-        //获取岗位与用户所属部门交集
-        if(StringUtil.hasValue(Arrays.toString(positions))){
-            userId += getUserBySameDeptAndPosition(positions)+";";
-        }
+        // 获取流程创建人id
+        String creator = getRunningdata().getWork().getCreator();
+        // 获取群组与用户所属部门交集
+        userId += GroupOrPositionUtil.getUserBySameDeptAndOrg(groups, creator) + ";";
+        // 获取岗位与用户所属部门交集
+        userId += GroupOrPositionUtil.getUserBySameDeptAndOrg(positions, creator) + ";";
         setResult(userId);
         return true;
     }
 
-    private String getUserBySameDeptAndPosition(String positions[]) {
-        OrganizationAdapter organization = new OrganizationAdapter();
-
-        //获取群组下的所有用户信息
-        if (positions.length < 1) return "";
-        String positionId = positions[0].replace("P_", "");
-        String positionIdUserIds = organization.getAllUserFromPosition(positionId, HorizonCore.TENANT_IDENTIFIER.value());
-        if (!StringUtil.hasValue(positionId)) return "";
-        List<Map<String, String>> userByIDs = organization.getUserByIDs(positionIdUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
-        //获取流程创建人id
-        String creator = getRunningdata().getWork().getCreator();
-        //根据用户id获取用户信息
-        Map<String,String> userMap  = organization.getUserById(creator, HorizonCore.TENANT_IDENTIFIER.value());
-        String deptId = userMap.get("dept_id");
-        //循环群组里用户的id
-        for (Map<String, String> user : userByIDs) {
-            if (user.get("dept_id").equals(deptId)) {
-                return user.get("id") + "/P_" + positionId;
-            }
-        }
-        return "";
-    }
-
-    private String getUserBySameDeptAndGroup(String groups[]) {
-        OrganizationAdapter organization = new OrganizationAdapter();
-
-        //获取群组下的所有用户信息
-        if (groups.length < 1) return "";
-        String groupId = groups[0].replace("G_", "");
-        String groupUserIds = organization.getAllUserFromGroup(groupId, HorizonCore.TENANT_IDENTIFIER.value());
-        if (!StringUtil.hasValue(groupUserIds)) return "";
-        List<Map<String, String>> userByIDs = organization.getUserByIDs(groupUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
-        //获取流程创建人id
-        String creator = getRunningdata().getWork().getCreator();
-        //根据用户id获取用户信息
-        Map<String,String> userMap  = organization.getUserById(creator, HorizonCore.TENANT_IDENTIFIER.value());
-        String deptId = userMap.get("dept_id");
-        for (Map<String, String> user : userByIDs) {
-            if (user.get("dept_id").equals(deptId)) {
-                return user.get("id") + "/G_" + groupId;
-            }
-        }
-        return "";
-    }
-
 
 }

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

@@ -0,0 +1,88 @@
+package com.horizon.custom;
+
+import com.horizon.core.HorizonCore;
+import com.horizon.third.adapter.OrganizationAdapter;
+import com.horizon.utils.StringUtil;
+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;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 根据组织机构里的群组或者岗位，与流程创建者做交集
+ * com.horizon.custom.GroupOrPositionCreator
+ */
+public class GroupOrPositionCreatorBak 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 = "";
+
+        //获取群组与用户所属部门交集
+        if(StringUtil.hasValue(Arrays.toString(groups))){
+            userId += getUserBySameDeptAndGroup(groups)+";";
+        }
+        //获取岗位与用户所属部门交集
+        if(StringUtil.hasValue(Arrays.toString(positions))){
+            userId += getUserBySameDeptAndPosition(positions)+";";
+        }
+        setResult(userId);
+        return true;
+    }
+
+    private String getUserBySameDeptAndPosition(String positions[]) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+
+        //获取群组下的所有用户信息
+        if (positions.length < 1) return "";
+        String positionId = positions[0].replace("P_", "");
+        String positionIdUserIds = organization.getAllUserFromPosition(positionId, HorizonCore.TENANT_IDENTIFIER.value());
+        if (!StringUtil.hasValue(positionId)) return "";
+        List<Map<String, String>> userByIDs = organization.getUserByIDs(positionIdUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
+        //获取流程创建人id
+        String creator = getRunningdata().getWork().getCreator();
+        //根据用户id获取用户信息
+        Map<String,String> userMap  = organization.getUserById(creator, HorizonCore.TENANT_IDENTIFIER.value());
+        String deptId = userMap.get("dept_id");
+        //循环群组里用户的id
+        for (Map<String, String> user : userByIDs) {
+            if (user.get("dept_id").equals(deptId)) {
+                return user.get("id") + "/P_" + positionId;
+            }
+        }
+        return "";
+    }
+
+    private String getUserBySameDeptAndGroup(String groups[]) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+
+        //获取群组下的所有用户信息
+        if (groups.length < 1) return "";
+        String groupId = groups[0].replace("G_", "");
+        String groupUserIds = organization.getAllUserFromGroup(groupId, HorizonCore.TENANT_IDENTIFIER.value());
+        if (!StringUtil.hasValue(groupUserIds)) return "";
+        List<Map<String, String>> userByIDs = organization.getUserByIDs(groupUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
+        //获取流程创建人id
+        String creator = getRunningdata().getWork().getCreator();
+        //根据用户id获取用户信息
+        Map<String,String> userMap  = organization.getUserById(creator, HorizonCore.TENANT_IDENTIFIER.value());
+        String deptId = userMap.get("dept_id");
+        for (Map<String, String> user : userByIDs) {
+            if (user.get("dept_id").equals(deptId)) {
+                return user.get("id") + "/G_" + groupId;
+            }
+        }
+        return "";
+    }
+
+
+}

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

@@ -0,0 +1,31 @@
+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.GroupOrPositionCreator
+ */
+public class GroupOrPositionCreatorByFDept 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.getUserBySameFDeptAndFOrg(groups, creator) + ";";
+        // 获取岗位与用户所属部门交集
+        userId += GroupOrPositionUtil.getUserBySameFDeptAndFOrg(positions, creator) + ";";
+        setResult(userId);
+        return true;
+    }
+}

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

@@ -1,21 +1,11 @@
 package com.horizon.custom;
 
 import com.horizon.core.HorizonCore;
-import com.horizon.core.tree.TreeModel;
-import com.horizon.core.tree.TreeNode;
-import com.horizon.third.adapter.OrganizationAdapter;
-import com.horizon.third.build.OrgDirector;
-import com.horizon.third.entity.OrgData;
-import com.horizon.utils.StringUtil;
 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;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 /**
  * 根据组织机构里的群组或者岗位，与当前操作人做交集
  * com.horizon.custom.GroupOrPositionToDoUser
@@ -23,63 +13,22 @@ import java.util.Map;
 public class GroupOrPositionToDoUser extends BaseRuleImpl implements IBaseRule {
     @Override
     public boolean executeRule() {
-        //3. 获取办理人的节点定义对象
+        // 3. 获取办理人的节点定义对象
         IFlowNode flowNode = (IFlowNode) getParameter(StaticVarExtend.Parameter_CustomeUser_IFlowNode);
-        //获取主办中设置的id
+        // 获取主办中设置的id
         String groups[] = flowNode.getParticipantsUserList().get(1).getGroup().split(";");
         String positions[] = flowNode.getParticipantsUserList().get(1).getPosition().split(";");
-        //5. 获取的办理人返回
+        // 5. 获取的办理人返回
         String userId = "";
-        //获取群组与用户所属部门交集
-        if(StringUtil.hasValue(Arrays.toString(groups))){
-            userId += getUserBySameDeptAndGroup(groups)+";";
-        }
-        //获取岗位与用户所属部门交集
-        if(StringUtil.hasValue(Arrays.toString(positions))){
-            userId += getUserBySameDeptAndPosition(positions)+";";
-        }
+        // 当前操作人，也就是当前登录用户
+        String todoUserId = HorizonCore.USER_ID.value();
+        // 获取群组与用户所属部门交集
+        userId += GroupOrPositionUtil.getUserBySameDeptAndOrg(groups, todoUserId) + ";";
+        // 获取岗位与用户所属部门交集
+        userId += GroupOrPositionUtil.getUserBySameDeptAndOrg(positions, todoUserId) + ";";
         setResult(userId);
         return true;
     }
 
-    private String getUserBySameDeptAndPosition(String positions[]) {
-        OrganizationAdapter organization = new OrganizationAdapter();
-
-        //获取岗位下的所有用户信息
-        if (positions.length < 1) return "";
-        String positionId = positions[0].replace("P_", "");
-        String positionIdUserIds = organization.getAllUserFromPosition(positionId, HorizonCore.TENANT_IDENTIFIER.value());
-        if (!StringUtil.hasValue(positionIdUserIds)) return "";
-        List<Map<String, String>> userByIDs = organization.getUserByIDs(positionIdUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
-
-        String deptId = HorizonCore.DEPT_ID.value();
-        //循环群组里用户的id
-        for (Map<String, String> user : userByIDs) {
-            if (user.get("dept_id").equals(deptId)) {
-                return user.get("id") + "/P_" + positionId;
-            }
-        }
-        return "";
-    }
-
-    private String getUserBySameDeptAndGroup(String groups[]) {
-        OrganizationAdapter organization = new OrganizationAdapter();
-
-        //获取群组下的所有用户信息
-        if (groups.length < 1) return "";
-        String groupId = groups[0].replace("G_", "");
-        String groupUserIds = organization.getAllUserFromGroup(groupId, HorizonCore.TENANT_IDENTIFIER.value());
-        if (!StringUtil.hasValue(groupUserIds)) return "";
-        List<Map<String, String>> userByIDs = organization.getUserByIDs(groupUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
-
-        String parentDeptId = HorizonCore.DEPT_ID.value();
-        for (Map<String, String> user : userByIDs) {
-            if (user.get("dept_id").equals(parentDeptId)) {
-                return user.get("id") + "/G_" + groupId;
-            }
-        }
-        return "";
-    }
-
 
 }

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

@@ -0,0 +1,81 @@
+package com.horizon.custom;
+
+import com.horizon.core.HorizonCore;
+import com.horizon.third.adapter.OrganizationAdapter;
+import com.horizon.utils.StringUtil;
+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;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 根据组织机构里的群组或者岗位，与当前操作人做交集
+ * com.horizon.custom.GroupOrPositionToDoUser
+ */
+public class GroupOrPositionToDoUserBak 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 = "";
+        //获取群组与用户所属部门交集
+        if(StringUtil.hasValue(Arrays.toString(groups))){
+            userId += getUserBySameDeptAndGroup(groups)+";";
+        }
+        //获取岗位与用户所属部门交集
+        if(StringUtil.hasValue(Arrays.toString(positions))){
+            userId += getUserBySameDeptAndPosition(positions)+";";
+        }
+        setResult(userId);
+        return true;
+    }
+
+    private String getUserBySameDeptAndPosition(String positions[]) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+
+        //获取岗位下的所有用户信息
+        if (positions.length < 1) return "";
+        String positionId = positions[0].replace("P_", "");
+        String positionIdUserIds = organization.getAllUserFromPosition(positionId, HorizonCore.TENANT_IDENTIFIER.value());
+        if (!StringUtil.hasValue(positionIdUserIds)) return "";
+        List<Map<String, String>> userByIDs = organization.getUserByIDs(positionIdUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
+
+        String deptId = HorizonCore.DEPT_ID.value();
+        //循环群组里用户的id
+        for (Map<String, String> user : userByIDs) {
+            if (user.get("dept_id").equals(deptId)) {
+                return user.get("id") + "/P_" + positionId;
+            }
+        }
+        return "";
+    }
+
+    private String getUserBySameDeptAndGroup(String groups[]) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+
+        //获取群组下的所有用户信息
+        if (groups.length < 1) return "";
+        String groupId = groups[0].replace("G_", "");
+        String groupUserIds = organization.getAllUserFromGroup(groupId, HorizonCore.TENANT_IDENTIFIER.value());
+        if (!StringUtil.hasValue(groupUserIds)) return "";
+        List<Map<String, String>> userByIDs = organization.getUserByIDs(groupUserIds.split(";"), HorizonCore.TENANT_IDENTIFIER.value());
+
+        String parentDeptId = HorizonCore.DEPT_ID.value();
+        for (Map<String, String> user : userByIDs) {
+            if (user.get("dept_id").equals(parentDeptId)) {
+                return user.get("id") + "/G_" + groupId;
+            }
+        }
+        return "";
+    }
+
+
+}

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

@@ -0,0 +1,125 @@
+package com.horizon.custom;
+
+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.utils.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: yangff  2025/4/23
+ */
+public class GroupOrPositionUtil {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GroupOrPositionUtil.class);
+
+    /**
+     * 获取userid所属部门，与设置的群组/岗位 下的人同部门的用户
+     *
+     * @param orgIds
+     * @param userId
+     * @return
+     */
+    public static String getUserBySameFDeptAndFOrg(String orgIds[], String userId) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+        // 最终办理人用户id
+        String userIds = "";
+        // 获取群组下的所有用户信息
+        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 "";
+            // 根据多个用户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");
+            String fDeptId =  GroupOrPositionUtil.queryFDept(deptId);
+
+            // 对比用户所属部门，如果相同，则添加到userIds中
+            for (Map<String, String> user : userByIDs) {
+                String fDeptIdTmp =  GroupOrPositionUtil.queryFDept(user.get("dept_id"));
+                if (fDeptIdTmp.equals(fDeptId)) {
+                    userIds += user.get("id") + "/" + orgId + ";";
+                    LOGGER.info("获取到{}里同步人员id:{}", orgId, user.get("id"));
+                }
+            }
+        }
+        return userIds;
+    }
+
+
+
+    /**
+     * 获取userid所属部门，与设置的群组/岗位 下的人同部门的用户
+     *
+     * @param orgIds
+     * @param userId
+     * @return
+     */
+    public static String getUserBySameDeptAndOrg(String orgIds[], String userId) {
+        OrganizationAdapter organization = new OrganizationAdapter();
+        // 最终办理人用户id
+        String userIds = "";
+        // 获取群组下的所有用户信息
+        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 "";
+            // 根据多个用户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"));
+                }
+            }
+        }
+        return userIds;
+    }
+
+    public static String queryFDept(String deptId){
+        // 机关部门，不取父ID，直接返回
+        if(deptId.startsWith("D0101")){
+            return deptId;
+        }
+        //D0110  D011003 质计中心
+        //D0101  D010101机关
+        String dbIdentifier = "jl_sgiip";
+        // 查询当前人所在部门的父部门D1101
+        String queryFDeptSql = "SELECT * from JLOPAPUSER.SYS_DEPARTMENT where ID = ?";
+        List<String> list = Lists.newArrayList();
+        // 参数传递
+        list.add(deptId);
+        Map resmap = Access.getSingleMap(queryFDeptSql, list, dbIdentifier);
+
+
+        String fDeptId = (String) resmap.get("f_id");
+
+        if(fDeptId.length() > 4){
+            fDeptId = fDeptId.substring(0, 5); // 截取前5位
+        }
+        return fDeptId;
+    }
+}

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

@@ -23,9 +23,17 @@ public class OrgBuilderImpl extends OrgBuilder {
 //        String deptsql = "select id,dept_code,dept_name,parent_id,order_no from to_horizon_dept where  id!='root_node_id' order by order_no";
 
         String deptsql = "";
-        deptsql += " select d.id,d.dept_code,d.dept_name, ( select a.id from JLOPAPUSER.sys_department a where a.dept_code = d.f_id and a.cancel_flag = '0' ) as parent_id  ,";
-        deptsql += " 'D' as type ,0 as order_no ";
-        deptsql += " from JLOPAPUSER.sys_department d where d.cancel_flag = '0' and  d.dept_code!='D' ";
+        deptsql += " select d.id, d.dept_code, d.dept_name, a.id as parent_id, ";
+        deptsql += " 'D' as type, 0 as order_no ";
+        deptsql += " from JLOPAPUSER.sys_department d ";
+        deptsql += " left join JLOPAPUSER.sys_department a ";
+        deptsql += " on a.dept_code = d.f_id and a.cancel_flag = '0' ";
+        deptsql += " where d.cancel_flag = '0' and d.dept_code != 'D' ";
+
+//        String deptsql = "";
+//        deptsql += " select d.id,d.dept_code,d.dept_name, ( select a.id from JLOPAPUSER.sys_department a where a.dept_code = d.f_id and a.cancel_flag = '0' ) as parent_id  ,";
+//        deptsql += " 'D' as type ,0 as order_no ";
+//        deptsql += " from JLOPAPUSER.sys_department d where d.cancel_flag = '0' and  d.dept_code!='D' ";
 
 
         List<Map<String, Object>> deptmap = Access.getMultiMap(deptsql, null, dbIdentifier);
@@ -75,7 +83,7 @@ public class OrgBuilderImpl extends OrgBuilder {
 //        String usersql = "select u.id,u.login_name,u.name,tor.dept_id from to_horizon_user u,tor_horizon_user_dept tor where u.id = tor.user_id";
 //        String usersql = "select u.id,u.user_name as login_name,u.user_desc,tor.dept_id from JLOPAPUSER.sys_user u,JLOPAPUSER.sys_user_department tor where u.id = tor.user_id";
         String usersql = "";
-        usersql += "  SELECT u.id,u.user_name as LOGIN_NAME,u.user_desc as NAME,tor.DEPT_ID ,'' as type FROM JLOPAPUSER.sys_user u,JLOPAPUSER.sys_user_department tor WHERE u.ID = tor.USER_ID";
+        usersql += "  SELECT u.id,u.user_name as LOGIN_NAME,u.user_desc as NAME,tor.DEPT_ID ,'' as type FROM JLOPAPUSER.sys_user u,JLOPAPUSER.sys_user_department tor WHERE u.ID = tor.USER_ID  AND u.cancel_flag = '0' AND tor.cancel_flag = '0'";
         usersql += "  union all";
         usersql += " select '1' as id ,'admin' as login_name  ,'超级管理员' as NAME ,'0' as DEPT_ID  ,'' as type from dual";
 
@@ -282,7 +290,7 @@ public class OrgBuilderImpl extends OrgBuilder {
 //        String sql="SELECT u.id,u.LOGIN_NAME,'F;D' as type,u.NAME,tor.DEPT_ID FROM TO_HORIZON_USER u,TOR_HORIZON_USER_DEPT tor WHERE u.ID = tor.USER_ID";
 
         String sql = "";
-        sql += "  SELECT u.id,u.user_name as LOGIN_NAME,u.user_desc as NAME,tor.DEPT_ID ,'' as type FROM JLOPAPUSER.sys_user u,JLOPAPUSER.sys_user_department tor WHERE u.ID = tor.USER_ID";
+        sql += "  SELECT u.id,u.user_name as LOGIN_NAME,u.user_desc as NAME,tor.DEPT_ID ,'' as type FROM JLOPAPUSER.sys_user u,JLOPAPUSER.sys_user_department tor WHERE u.ID = tor.USER_ID AND u.cancel_flag = '0' AND tor.cancel_flag = '0'";
         sql += "  union all";
         sql += " select '1' as id ,'admin' as login_name  ,'超级管理员' as NAME ,'0' as DEPT_ID  ,'' as type from dual";
 

src/main/java/com/horizon/wf/util/PushWorkflowToPortal.java

@@ -94,6 +94,8 @@ public class PushWorkflowToPortal {
                     jsonObject.put("startUserId", creator);
                     jsonObject.put("startTime", startTime);
                     jsonObject.put("nextUserId", nextUserId);
+                    // 业务类型：工作流业务默认为1
+                    jsonObject.put("businessType", "1");
                     jsonObject.put("toWebPath", "/workflow/detail");
 
                     JSONObject businessParam = new JSONObject();
@@ -103,6 +105,7 @@ public class PushWorkflowToPortal {
                     businessParam.put("trackId", trackId);
                     businessParam.put("subjectionId", subjectionId);
                     businessParam.put("nodeId", nodeId);
+                    businessParam.put("nodeName", nodeName);
                     businessParam.put("type", "3");
                     jsonObject.put("businessParam", businessParam.toJSONString());
 
@@ -162,19 +165,19 @@ public class PushWorkflowToPortal {
                             String todoDetailUrl;
                             String todoDetailUrlMobile;
                             if(subjectionId != null && !subjectionId.isEmpty()){
-                                 todoDetailUrl = "http://10.198.1.15/#/workflow/detail?userId="
+                                todoDetailUrl = "http://10.198.1.15/#/workflow/detail?userId="
                                         + nextUserId + "&from=oa&workId=" + workId + "&trackId="
                                         + trackId + "&flowId=" + flowId + "&subjectionId=" + subjectionId;
 
-                                 todoDetailUrlMobile = "https://jlwuliu.shansteelgroup.com/h5/workflow?userId="
+                                todoDetailUrlMobile = "https://jlwuliu.shansteelgroup.com/h5/workflow?userId="
                                         + nextUserId + "&workId=" + workId + "&trackId="
                                         + trackId + "&flowId=" + flowId + "&subjectionId=" + subjectionId;
                             }else {
-                                 todoDetailUrl = "http://10.198.1.15/#/workflow/detail?userId="
+                                todoDetailUrl = "http://10.198.1.15/#/workflow/detail?userId="
                                         + nextUserId + "&from=oa&workId=" + workId + "&trackId="
                                         + trackId + "&flowId=" + flowId;
 
-                                 todoDetailUrlMobile = "https://jlwuliu.shansteelgroup.com/h5/workflow?userId="
+                                todoDetailUrlMobile = "https://jlwuliu.shansteelgroup.com/h5/workflow?userId="
                                         + nextUserId + "&workId=" + workId + "&trackId="
                                         + trackId + "&flowId=" + flowId ;
                             }
@@ -282,18 +285,17 @@ public class PushWorkflowToPortal {
                 for(int index = 0; index < insertFields.length; index++){
                     insertTodo.put(insertFields[index], insertParas.getString(index));
                 }
-                //{AGENT_ID=-null-, SENDUSERNAME=李泰, SUBJECTION_TYPE=D, ISAGENT=0, PRIORITY=0,
-                // FLOWID=Test, NODEID=Node2, FLOWNAME=测试流程, AUTH_ID=D56A1065B85242908BB025B7C91B0B62,
-                // DOTIME=null, STATUS=Author, WORKID=HZ90e9939623dbe7019623dc18680005,
-                // SENDTIME=2025-04-11 15:59:34, ID=HZ90e9939623dbe7019623dc7d980019,
-                // STATUS_NO=101, WORKVER=2, TRACKACTIVE=1, SUBJECTIONNAME=, TRACKID=HZ90e9939623dbe7019623dc18680006,
-                // SENDUSERID=2, ISACTIVE=1, TRACKSTATUS=110, ISCLAIM=0, NODENAME=经理审批, SENDSUBJECTIONNAME=,
-                // LIMITTIME=0(天), TITLE=测试流程,请办理., SENDSUBJECTIONID=3, SUBJECTION_ID=2, SENDSUBJECTIONTYPE=D}
+
                 String status = insertTodo.get("STATUS"); //Author主办
                 String statusNo = insertTodo.get("STATUS_NO"); //Author主办
                 String authId = insertTodo.get("AUTH_ID"); //办理人id
                 // String agentId = insertTodo.get("AGENT_ID"); //代办人id
-                Map<String, String> author = organizationAdapter.getUserById(authId, paraBean.getFlowIdentifier());
+                Map<String, String> author = null;
+                try {
+                    author = organizationAdapter.getUserById(authId, paraBean.getFlowIdentifier());
+                }catch (Exception e){
+                    continue;
+                }
                 String authName = author.get("name"); //办理人姓名
                 String authLoginName = author.get("login_name"); //办理人账号
                 String sendUserName = insertTodo.get("SENDUSERNAME");
@@ -337,7 +339,8 @@ public class PushWorkflowToPortal {
                 map.put("id", id);
                 insertSaveMap.put(id, map);
 
-            } else if(sqlType.equals("UPDATE")&&flag.equals("DONE")){ //待办变已办
+            }
+            else if(sqlType.equals("UPDATE")&&flag.equals("DONE")){ //待办变已办
                 JSONArray todoIds = currentItem.getJSONArray("WherePara");
                 String workId = paraBean.getWorkId(); //workid
                 String[] setFields = currentItem.getString("SetFields").substring(1, currentItem.getString("SetFields").length()-1).split(",");

src/main/resources/workflow-conf/workflow-context.xml

@@ -141,7 +141,7 @@
 <!--	</bean>-->
 	<!-- 组织机构实现-->
 	<bean id="workflowAdapterFactory" class="com.horizon.third.init.WorkflowAdapterFactory">
-		<property name="organizationBuilder" value="com.horizon.org.OrgBuilderImplSgiip"/>
+		<property name="organizationBuilder" value="com.horizon.org.OrgBuilderImpl"/>
 	</bean>
 
 	<!-- 流程外部表单 -->