guarantee-lsq 2 månader sedan
förälder
incheckning
dc52508e70

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/custom/CustomClassName.java

@@ -89,6 +89,6 @@ public class CustomClassName implements Serializable {
 
     private String handleCode; // 处理类编码
 
-    private Integer publicFlag; // 是否公共处理类,1 是 0 否
+    private Integer publicFlag; // 是否自定义处理类,1 是 0 否
 
 }

+ 1 - 1
platform-dao/src/main/resources/mapper/custom/CustomClassNameMapper.xml

@@ -71,6 +71,6 @@
             <if test="code != null and code != ''">
                 code = #{code}
             </if>
-        </where>) t join t_custom_class_name ccn on t.titleId = ccn.title_code
+        </where>) t join t_custom_class_name ccn on (t.titleId = ccn.title_code and ccn.code = #{code})
     </select>
 </mapper>

+ 1 - 1
platform-service/src/main/java/com/platform/service/workflow/verifyStrategy/impl/VerifyPassStrategy.java

@@ -148,7 +148,7 @@ public class VerifyPassStrategy extends AbstractBaseStrategy {
                 CustomClassName className = customClassNameMapper.selectByPrimaryKey(node.getSwitchHandleId());
                 Boolean findFlag = Boolean.FALSE; // 符合分支条件
                 // 分情况讨论,如果选择是自定义处理类
-                if(className.getPublicFlag() == null || className.getPublicFlag() == 0){
+                if(className.getPublicFlag() != null && className.getPublicFlag().intValue() == YesNoEnum.YES.getValue()){
                     Object obj = BeanUtils.getBean(className.getHandleCode());
                     Class cla = obj.getClass();
                     try {