待办bug修复

src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml

@@ -565,21 +565,14 @@
         AND n.status = '0'
     </select>
     <select id="selectCurrentExecUserInfo" resultMap="TaskListUnionMap">
-        SELECT
+        SELECT tu.USERID CURRUSERID,
-            tu.USERID CURRUSERID,
+        tu.REALNAME CURRUSERNAME,
-            tu.REALNAME CURRUSERNAME,
+        torg.ORGUNITID ORGUNITID,
-            torg.ORGUNITID ORGUNITID,
+        torg.ORGUNITNAME ORGUNITNAME
-            torg.ORGUNITNAME ORGUNITNAME
+        FROM TSOPINION n LEFT JOIN CXAICORG.T_USERS tu ON tu.USERID = n.HANDLERID
-        FROM CXAICORG.T_USERS tu LEFT JOIN CXAICORG.T_ORGUNITS torg ON tu.ORGUNITID = torg.ORGUNITID
+        LEFT JOIN CXAICORG.T_ORGUNITS torg ON tu.ORGUNITID = torg.ORGUNITID
-        WHERE
+        WHERE n.WORKFLOWID = #{workFlowId}
-            tu.USERID = (
+        ORDER BY n.OPINIONTYPE DESC LIMIT 1
-            SELECT
-                n.HANDLERID
-            FROM
-                TSOPINION n
-            WHERE
-                tu.USERID = n.HANDLERID AND n.WORKFLOWID = #{workFlowId}
-            ORDER BY n.OPINIONTYPE DESC LIMIT 1)
     </select>
     <select id="selectFinishUnionTaskPage" resultMap="TaskListUnionMap">
         SELECT *
@@ -602,7 +595,7 @@
                                     tso.HANDLERID = #{customParamMap.userId}
                                     or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
                                     where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
-                                    and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+<!--                                    and torg.ORGNUMBER != #{customParamMap.myOrgNumber}-->
                                     ))
                                 </when>
                                 <otherwise>
@@ -628,7 +621,7 @@
                                     tso.HANDLERID = #{customParamMap.userId}
                                     or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
                                     where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
-                                    and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+<!--                                    and torg.ORGNUMBER != #{customParamMap.myOrgNumber}-->
                                     ))
                                 </when>
                                 <otherwise>
@@ -643,7 +636,7 @@
             </choose>
             (select DISTINCT t.TASKLISTID, t.WORKFLOWID, t.BIZSEQID, t.SIGNUSERID, t.SENDERORGID, t.SENDERUSERID, t.SENDTOORGID, t.ACCEPTNO, t.BUSNAME, t.SIGNTIME, t.BUSTYPE, t.BUSSTATUS, t.LINKNAME, t.AUDITDEPTTYPE, t.ISSIGNON, t.SIGNLOGINNAME, t.SENDERTIME, t.SENDERNAME, t.ACCEPTGROUPID, t.AREA_CODE, t.LAUPTIME , b.STATUS as currentNodeOrBizStatus, null as lastNode, t.CREATETIME
             from tsrevtasklist t, tsbizrevlist b,TShwfProcessNode n
-            where t.bizseqid = b.bizseq and t.busstatus = '0' and b.ISREMOVE = '0'
+            where t.bizseqid = b.bizseq and t.busstatus = '0' and b.ISREMOVE = '0' AND REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1
             and t.WorkflowID = n.processid and t.WORKFLOWID in (SELECT DISTINCT WORKFLOWID FROM tsopinion tso
             <where>
                 <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
@@ -653,7 +646,7 @@
                             tso.HANDLERID = #{customParamMap.userId}
                             or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
                             where tso.HANDLERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
-                            and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+<!--                            and torg.ORGNUMBER != #{customParamMap.myOrgNumber}-->
                             ))
                         </when>
                         <otherwise>
@@ -666,7 +659,7 @@
             (select DISTINCT ta.TASKLISTID, ta.WORKFLOWID, ta.BIZSEQID, ta.SIGNUSERID, ta.SENDERORGID, ta.SENDERUSERID, ta.SENDTOORGID, ta.ACCEPTNO, ta.BUSNAME, ta.SIGNTIME, ta.BUSTYPE, ta.BUSSTATUS, ta.LINKNAME, ta.AUDITDEPTTYPE, ta.ISSIGNON,ta.SIGNLOGINNAME, ta.SENDERTIME, ta.SENDERNAME, ta.ACCEPTGROUPID, ta.AREA_CODE, ta.LAUPTIME, n.currentNode as currentNodeOrBizStatus,SUBSTR(n.NODEFLOW, 1, INSTR(n.NODEFLOW, '_') - 1) as lastNode, ta.CREATETIME
             from TSTaskList ta
             LEFT JOIN TSTwfProcessNode n on ta.WorkflowID = n.processid
-            where ta.BUSSTATUS in ('-1', '0', '1', '3', '5')
+            where ta.BUSSTATUS in ('-1', '0', '1', '3', '5') AND REGEXP_LIKE(n.currentNode, '^end|over', 'i') = 1
             <if test="customParamMap.childUnitSwitch != null and customParamMap.childUnitSwitch != ''">
                 <choose>
                     <when test='customParamMap.childUnitSwitch eq "1"'>
@@ -674,7 +667,7 @@
                         n.CURRUSERID = #{customParamMap.userId}
                         or exists(select 1 from CXAICORG.T_USERS tu left join CXAICORG.T_ORGUNITS torg on tu.ORGUNITID = torg.ORGUNITID
                         where n.CURRUSERID = tu.USERID and torg.ORGNUMBER like #{customParamMap.myOrgNumberLike}
-                        and torg.ORGNUMBER != #{customParamMap.myOrgNumber}
+<!--                        and torg.ORGNUMBER != #{customParamMap.myOrgNumber}-->
                         ))
                     </when>
                     <otherwise>