Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7sfstdtempl/ibiz4jr7 into dev

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -759,11 +759,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
     <#if isDynaSys>
     private Map<String,Map<String,Object>> fillWFTaskContext(${item.getCodeName()}SearchContext context){
         Map<String, Map<String, Object>> businessKeys = null;
-        if (!StringUtils.isEmpty(context.getSrfDynaInstId())) {
-            if (!ObjectUtils.isEmpty(context.getSrfWF()) && "toread".equals(context.getSrfWF())) {
+        if (!StringUtils.isEmpty(context.getSrfDynaInstId())  && !StringUtils.isEmpty(context.getSrfWF())) {
+            String srfWF = context.getSrfWF();
+            if ("toread".equals(srfWF)) {
                 businessKeys= ibzwfFeignClient.getUnReadTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", context.getSrfDynaInstId());
             }
-            else if (!ObjectUtils.isEmpty(context.getSrfWF()) && "todo".equals(context.getSrfWF())) {
+            else if ("todo".equals(srfWF)) {
                 businessKeys= ibzwfFeignClient.getTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", context.getSrfDynaInstId());
             }
             if(!ObjectUtils.isEmpty(businessKeys)){

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

@@ -542,6 +542,8 @@ public class DELogicAspect {
     private String systemId;
     @Value("${r'$'}{ibiz.dynainstid:${sys.getCodeName()?lower_case}}")
     private String defaultDynaInstId;
+    @Value("${r'$'}{ibiz.isDyna:false}")
+    private boolean isDyna;
 
     <#assign hasDynamicModule =false>
     <#assign hasLocalModule = false>
@@ -570,7 +572,7 @@ public class DELogicAspect {
         <#if hasDynamicModule>
     @Around("${dynamicModule}")
     public Object executeRemoteLogic(ProceedingJoinPoint point) throws Throwable {
-        return executeLogic(point, true);
+        return executeLogic(point, isDyna && true);
     }
         </#if>
 
@@ -611,12 +613,12 @@ public class DELogicAspect {
         } else if (arg instanceof EntityBase) {
             entity = (EntityBase) arg;
         }
-        String dynaInstId = null;
-        if (isDyna) {
-            dynaInstId = getDynaInstId(entity);
-            dynaInstId = ObjectUtils.isEmpty(dynaInstId) ? defaultDynaInstId : dynaInstId;
-        }
         if (entity != null) {
+            String dynaInstId = null;
+            if (isDyna) {
+                dynaInstId = getDynaInstId(entity);
+                dynaInstId = ObjectUtils.isEmpty(dynaInstId) ? defaultDynaInstId : dynaInstId;
+            }
             executeBeforeLogic(entity, action, isDyna, dynaInstId);
             Object result = point.proceed();
             if("get".equalsIgnoreCase(action) && result instanceof EntityBase){