补充代码

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/aspect/DELogicAspect.java.ftl

@@ -271,7 +271,7 @@ public class DELogicAspect {
                         if (item instanceof CallActivity) {
                             CallActivity subBpmn = (CallActivity) item;
                             String bpmnFileName = subBpmn.getName();
-                            log.debug("正在加载 BPMN{}", bpmnFileName);
+                            log.debug("正在加载   BPMN:{}", bpmnFileName);
                             File subBpmnFile = getSubBpmn(bpmnFileName);
                             if (ObjectUtils.isEmpty(subBpmnFile)) {
                                 log.debug("BPMN:{},缺少文件:{} ", bpmnFileName, subBpmnFile);
@@ -399,10 +399,11 @@ public class DELogicAspect {
      * @return
      */
     private File getDrl(File bpmn) {
-        if(!bpmn.getName().contains("RuleFlow.bpmn")){
+        if (bpmn.getPath().endsWith("RuleFlow.bpmn")) {
+            return new File(bpmn.getPath().replace("RuleFlow.bpmn", "Rule.drl"));
+        } else {
             return new File(bpmn.getPath().replace(".bpmn", ".drl"));
         }
-        return new File(bpmn.getPath().replace("RuleFlow.bpmn", "Rule.drl"));
     }
 
     /**
@@ -784,7 +785,7 @@ public class DELogicAspect {
                         if (item instanceof CallActivity) {
                             CallActivity subBpmn = (CallActivity) item;
                             String bpmnFileName = subBpmn.getName();
-                            log.debug("正在加载 BPMN{}", bpmnFileName);
+                            log.debug("正在加载   BPMN:{}", bpmnFileName);
                             File subBpmnFile = getSubBpmn(getDEModule(entity), entity.getClass().getSimpleName(), bpmnFileName, logicMode);
                             if (ObjectUtils.isEmpty(subBpmnFile)) {
                                 log.debug("BPMN:{},缺少文件:{} ", bpmnFileName, subBpmnFile);