Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-workflow/src/main/java/com/zjugis/z_workflow/controller/HandlerCaseCenterController.java

@@ -127,7 +127,7 @@ public class HandlerCaseCenterController extends BaseController {
      */
     @ResponseBody
     @RequestMapping
-    public String indexModuleList() {
+    public String officeCenterModule() {
         Map viewMap = Maps.newHashMap();
         String modules = keyValueService.getRedisValueByKey(GlobalConstant.OFFICE_CENTER_MODULE);
         List<OfficeCenterModuleDto> moduleList = new ArrayList<>();

zjugis-workflow/src/main/resources/mapper/oracle/IFlowInstanceMapper.xml

@@ -352,7 +352,7 @@
         ) P ON R.ID = P.SEND_BACK_RECORD_ID
         )T
         INNER JOIN I_ACTIVITY_INSTANCE T1 ON T.BACK_TO_ACTIVITY_ID = T1.ID
-        INNER JOIN I_FLOW_INSTANCE T2 ON T1.FLOW_INSTANCE_ID = T2.ID
+        INNER JOIN I_FLOW_INSTANCE T2 ON T1.FLOW_INSTANCE_ID = T2.ID AND T1.I_END = 0
         <if test="p.flowTemIds != null and p.flowTemIds.size()>0">
             INNER JOIN T_FLOW_TEMPLATE_VERSION T3 on T2.FLOW_TEMPLATE_VERSION_ID= T3.ID
         </if>
@@ -1802,7 +1802,7 @@
             ) P ON R.ID = P.SEND_BACK_RECORD_ID
             )T
             INNER JOIN I_ACTIVITY_INSTANCE T1 ON T.BACK_TO_ACTIVITY_ID = T1.ID
-            INNER JOIN I_FLOW_INSTANCE T2 ON T1.FLOW_INSTANCE_ID = T2.ID
+            INNER JOIN I_FLOW_INSTANCE T2 ON T1.FLOW_INSTANCE_ID = T2.ID AND T2.I_END = 0
             <if test="p.flowTemIds != null and p.flowTemIds.size()>0">
                 INNER JOIN T_FLOW_TEMPLATE_VERSION T3 on T2.FLOW_TEMPLATE_VERSION_ID= T3.ID
             </if>