Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -384,6 +384,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     nextNodeUserSids.append(sid).append(",");
                 }
             }
+            if (StringUtils.isBlank(nextNodeUserSids)){
+                return rb.setMsg("下一环节暂无操作人员");
+            }
             String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
             bv.setNextNodeUserSids(substring);
         }
@@ -437,6 +440,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                 nextNodeUserSids.append(sid).append(",");
             }
         }
+        if (StringUtils.isBlank(nextNodeUserSids)){
+            return rb.setMsg("下一环节暂无操作人员");
+        }
         String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
         bv.setNextNodeUserSids(substring);
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -403,6 +403,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     nextNodeUserSids.append(sid).append(",");
                 }
             }
+            if (StringUtils.isBlank(nextNodeUserSids)){
+                return rb.setMsg("下一环节暂无操作人员");
+            }
             String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
             bv.setNextNodeUserSids(substring);
         }
@@ -423,6 +426,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                     nextNodeUserSids.append(sid).append(",");
                 }
             }
+            if (StringUtils.isBlank(nextNodeUserSids)){
+                return rb.setMsg("下一环节暂无操作人员");
+            }
             String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
             bv.setNextNodeUserSids(substring);
         }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -517,8 +517,10 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
 
             //根据appSid查询最新版本的app插件包:以及类型：2插件，1框架
             if(StringUtils.isNotBlank(appSid)){
+                if(appSid.contains("#")){
                     type = Arrays.asList(appSid.split("#")).get(1);
                 }
+            }
             if ("1".equals(type)) {
 
             } else if ("2".equals(type)) {