工作流待阅

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)){