bug fix

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

@@ -23,7 +23,7 @@ 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 ) as parent_id  ,";
+        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' ";
 

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

@@ -23,9 +23,9 @@ public class OrgBuilderImplSgiip 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 sgiip.sys_department a where a.dept_code = d.f_id ) as parent_id  ,";
+        deptsql += " select d.id,d.dept_code,d.dept_name, ( select a.id from SGIIP.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 sgiip.sys_department d where d.cancel_flag = '0' and  d.dept_code!='D' ";
+        deptsql += " from SGIIP.sys_department d where d.cancel_flag = '0' and  d.dept_code!='D' ";
 
 
         List<Map<String, Object>> deptmap = Access.getMultiMap(deptsql, null, dbIdentifier);
@@ -33,7 +33,7 @@ public class OrgBuilderImplSgiip extends OrgBuilder {
         List<OrgData> datas = Lists.newArrayList();
         //处理根部门
         OrgData data_r = new OrgData();
-        data_r.setId("1");
+        data_r.setId("42CA714042F611B294EBBFC341F14635");
         data_r.setName("部门导航");
         data_r.setParentId("0");
         data_r.setType("D");
@@ -46,7 +46,7 @@ public class OrgBuilderImplSgiip extends OrgBuilder {
             String sort = map.get("order_no") == null ? "" : map.get("order_no").toString();
 
             if ("0".equals(parentId)) {
-                parentId = "1"; //部门导航、最顶层
+                parentId = "42CA714042F611B294EBBFC341F14635"; //部门导航、最顶层
             }
             //一个data对象封装一个部门信息
             OrgData data_d = new OrgData();
@@ -75,7 +75,7 @@ public class OrgBuilderImplSgiip 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 sgiip.sys_user u,sgiip.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 sgiip.sys_user u,sgiip.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 SGIIP.sys_user u,SGIIP.sys_user_department tor WHERE u.ID = tor.USER_ID";
         usersql += "  union all";
         usersql += " select '1' as id ,'admin' as login_name  ,'超级管理员' as NAME ,'0' as DEPT_ID  ,'' as type from dual";
 
@@ -164,7 +164,7 @@ public class OrgBuilderImplSgiip extends OrgBuilder {
         String deptsql = "";
         deptsql += " select d.id,d.post_code,d.post_name, 'position_root' as parent_id,";
         deptsql += " 'P' as type ,0 as order_no";
-        deptsql += " from sgiip.sys_post d where d.cancel_flag = '0'";
+        deptsql += " from SGIIP.sys_post d where d.cancel_flag = '0'";
 
 
         List<Map<String, Object>> deptmap = Access.getMultiMap(deptsql, null, dbIdentifier);
@@ -207,7 +207,7 @@ public class OrgBuilderImplSgiip extends OrgBuilder {
 
 
     private Map<String, List<User>> getUsersAndPost(String dbIdentifier) {
-        String usersql = " SELECT u.id,u.user_name as LOGIN_NAME,u.user_desc as NAME,tor.post_ID ,'' as type FROM sgiip.sys_user u,sgiip.sys_user_post tor WHERE u.ID = tor.USER_ID ";
+        String usersql = " SELECT u.id,u.user_name as LOGIN_NAME,u.user_desc as NAME,tor.post_ID ,'' as type FROM SGIIP.sys_user u,SGIIP.sys_user_post tor WHERE u.ID = tor.USER_ID ";
         List<Map<String, Object>> userMap = Access.getMultiMap(usersql, null, dbIdentifier);
         Map<String, List<User>> usersAndDept = new HashMap<String, List<User>>();
         for (Map<String, Object> map : userMap) {
@@ -282,7 +282,7 @@ public class OrgBuilderImplSgiip 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 sgiip.sys_user u,sgiip.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 SGIIP.sys_user u,SGIIP.sys_user_department tor WHERE u.ID = tor.USER_ID";
         sql += "  union all";
         sql += " select '1' as id ,'admin' as login_name  ,'超级管理员' as NAME ,'0' as DEPT_ID  ,'' as type from dual";
 
@@ -304,7 +304,7 @@ public class OrgBuilderImplSgiip extends OrgBuilder {
             u.setId(id);
             u.setUserName(name);
             u.setLoginName(loginName);
-            u.setPasswd("1234");//密码，一般设置默认统一的密码
+            u.setPasswd("xxjsgs@1234");//密码，一般设置默认统一的密码
             u.setDepartment(listDept);
             u.setOrderNo(1);//用户排序，可选
 

src/main/java/com/horizon/wf/action/base/BaseAction.java

@@ -757,7 +757,6 @@ public abstract class BaseAction {
             XMLTodoPub.startThread(workid, tmpIdList, identifier);
         }
         catch (Exception e) {
-            System.err.println("ewqewqe");
             e.printStackTrace();
         }
         //将数据推送给,这里设置的数据将在WorkflowHelper.sendTodoData方法中使用,

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

@@ -76,8 +76,10 @@ public class PushWorkflowToPortal {
                     String workId = value.get("workId");
                     String trackId = value.get("trackId");
                     String flowId = value.get("flowId");
-                    String nodeId = value.get("nodeId");
                     String flowName = value.get("flowName");
+                    String nodeId = value.get("nodeId");
+                    String nodeName = value.get("nodeName");
+                    String sendUserName = value.get("sendUserName");
 
                     String title = value.get("title");
 
@@ -143,11 +145,11 @@ public class PushWorkflowToPortal {
                             // 任务时间（如来源系统⽆则由统⼀待办⽣成）
                             wbPushTodoDto.setTaskTime(startTime);
                             // 任务推送⼈
-                            wbPushTodoDto.setCreateUser(creator);
+                            wbPushTodoDto.setCreateUser(sendUserName);
                             // 流程当前节点Id
                             wbPushTodoDto.setNodeDefId(nodeId);
                             // 流程当前节点名称
-                            wbPushTodoDto.setNodeDefName(nodeId);
+                            wbPushTodoDto.setNodeDefName(nodeName);
                             // 流程定义id
                             wbPushTodoDto.setProcDefId(flowId);
                             // 流程实例名称
@@ -280,6 +282,13 @@ 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
@@ -287,6 +296,7 @@ public class PushWorkflowToPortal {
                 Map<String, String> author = organizationAdapter.getUserById(authId, paraBean.getFlowIdentifier());
                 String authName = author.get("name"); //办理人姓名
                 String authLoginName = author.get("login_name"); //办理人账号
+                String sendUserName = insertTodo.get("SENDUSERNAME");
                 // Map<String, String> agentor = organizationAdapter.getUserById(agentId, paraBean.getFlowIdentifier());
                 // String agentName = agentor.get("name"); //代办人姓名
                 // String agentLoginName = agentor.get("login_name"); //代办人账号
@@ -295,6 +305,7 @@ public class PushWorkflowToPortal {
                 String flowId = insertTodo.get("FLOWID");
                 String flowName = insertTodo.get("FLOWNAME");
                 String nodeId = insertTodo.get("NODEID");
+                String nodeName = insertTodo.get("NODENAME");
                 String title = insertTodo.get("TITLE");
                 String sendTime = insertTodo.get("SENDTIME"); //sendtime
                 String subjectionType = insertTodo.get("SUBJECTION_TYPE"); //办理人所属组织type D部门 G群组 P岗位
@@ -309,6 +320,7 @@ public class PushWorkflowToPortal {
                     map.put("title", title);
                     map.put("flowName", flowName);
                     map.put("nodeId", nodeId);
+                    map.put("nodeName", nodeName);
                 }
                 map.put("authId", authId);
                 map.put("authName", authName);
@@ -316,6 +328,7 @@ public class PushWorkflowToPortal {
                 // map.put("agentId", agentId);
                 // map.put("agentName", agentName);
                 // map.put("agentLoginName", agentLoginName);
+                map.put("sendUserName", sendUserName);
                 map.put("sendTime", sendTime);
                 map.put("subjectionType", subjectionType);
                 map.put("subjectionId", subjectionId);

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

@@ -135,9 +135,13 @@
 	<!-- 定时任务接口-->
 	<bean id="horizonTask" class="com.horizon.task.api.impl.HorizonTaskImpl"/>
 
-<!--	 组织机构实现-->
+    <!-- 组织机构实现-->
+<!--	<bean id="workflowAdapterFactory" class="com.horizon.third.init.WorkflowAdapterFactory">-->
+<!--		<property name="organizationBuilder" value="com.horizon.org.OrgBuilderImplSgiip"/>-->
+<!--	</bean>-->
+	<!-- 组织机构实现-->
 	<bean id="workflowAdapterFactory" class="com.horizon.third.init.WorkflowAdapterFactory">
-		<property name="organizationBuilder" value="com.horizon.org.OrgBuilderImplShindi"/>
+		<property name="organizationBuilder" value="com.horizon.org.OrgBuilderImplSgiip"/>
 	</bean>
 
 	<!-- 流程外部表单 -->