更新 %ITEM%Service.java.ftl

SLN/%PUBPRJ%-app/%PUBPRJ%-app-%APP_PKGPATH%/src/main/java/%SYS_PKGPATH%/%APP_PKGPATH%/%MOD_PKGPATH%/service/%ITEM%Service.java.ftl

@@ -32,14 +32,13 @@ TARGET=PSAPPDATAENTITY
 <#assign itemCodeNameLC = itemCodeName?lower_case>
 <#assign itemSysApiCodeName = deapi.getPSSysServiceAPI().getCodeName()>
 <#assign itemSysApiCodeNameLC = deapi.getPSSysServiceAPI().getCodeName()?lower_case>
-
 package ${pub.getPKGCodeName()}.${app.getPKGCodeName()?lower_case}.${de.getPSSystemModule().codeName?lower_case}.service;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
-import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
 
 import feign.Client;
 import feign.Contract;
@@ -47,13 +46,14 @@ import feign.Feign;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 
-import com.alibaba.fastjson.JSONObject;
-
 import org.springframework.util.DigestUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
+import org.springframework.stereotype.Service;
 
 import ${pub.getPKGCodeName()}.util.feign.suport.SearchContextFeignEncode;
 import ${pub.getPKGCodeName()}.${app.getPKGCodeName()?lower_case}.${de.getPSSystemModule().codeName?lower_case}.domain.${item.getCodeName()};
@@ -74,7 +74,10 @@ import ${pub.getPKGCodeName()}.util.config.WFActivitiEngineClientProperties;
 import ${pub.getPKGCodeName()}.util.feign.WFEngineFeignClient;
     </#if>
 </#if>
+import ${pub.getPKGCodeName()}.util.log.IBIZLog;
 
+@Slf4j
+@IBIZLog
 @Service
 public class ${item.getCodeName()}Service {
 
@@ -457,18 +460,32 @@ public class ${item.getCodeName()}Service {
             // 登录用户信息
             LoginUser loginUser = SpringContextHolder.getCurLoginUser();
             if (loginUser == null) {
-                data.put("srfmsg", "用户未登录");
-                return false;
+                JSONObject jsonLoginUser = data.getJSONObject("loginuser");
+                if (jsonLoginUser == null) {
+                    data.put("srfmsg", "用户未登录");
+                    return false;
+                }
+                // 组织信息存储
+                wfinstance.setOriginpersonid(jsonLoginUser.getString("personId"));
+                wfinstance.setOriginpersonname(jsonLoginUser.getString("orgUserName"));
+                wfinstance.setOriginorgid(jsonLoginUser.getString("orgId"));
+                wfinstance.setOriginorgname(jsonLoginUser.getString("orgName"));
+                wfinstance.setOriginorgdeptid(jsonLoginUser.getString("orgDeptId"));
+                wfinstance.setOriginorgdeptname(jsonLoginUser.getString("orgDeptName"));
+
+                loginuserStr = jsonLoginUser.getString("personId");
+            } else {
+                // 组织信息存储
+                wfinstance.setOriginpersonid(loginUser.getPersonId());
+                wfinstance.setOriginpersonname(loginUser.getOrgUserName());
+                wfinstance.setOriginorgid(loginUser.getOrgId());
+                wfinstance.setOriginorgname(loginUser.getOrgName());
+                wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
+                wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
+
+                loginuserStr = loginUser.getPersonId();
             }
-            // 组织信息存储
-            wfinstance.setOriginpersonid(loginUser.getPersonId());
-            wfinstance.setOriginpersonname(loginUser.getOrgUserName());
-            wfinstance.setOriginorgid(loginUser.getOrgId());
-            wfinstance.setOriginorgname(loginUser.getOrgName());
-            wfinstance.setOriginorgdeptid(loginUser.getOrgDeptId());
-            wfinstance.setOriginorgdeptname(loginUser.getOrgDeptName());
-
-            loginuserStr = loginUser.getPersonId();
+
         }
         wfinstance = uniWFFeignClient.createWFInstance(wfinstance);
         ${itemCodeNameLC}.set${de.getDefaultPSDEWF().getWFInstPSDEField().getCodeName()?cap_first}(wfinstance.getWfinstanceid());