From ee68ec1a404b8df679a8cb76ab6eab59979c0b9d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 23:49:21 +0800
Subject: [PATCH] 赋默认值方法修改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 1e18849..e187c23 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -68,6 +68,7 @@
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.annotation.OperateLog;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -505,6 +506,7 @@
         CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
         CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
         CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());
+		final BladeUser user = AuthUtil.getUser();
         //1.鍒ゆ柇瑙勫垯涓櫎浜嗘祦姘寸爜娈碉紝鏄惁鏈夊叾浠栫爜娈�
         checkSecValueOnOrder(ruleVO, orderDTO);
         //2.鍒ゆ柇蹇呰緭椤�
@@ -535,13 +537,13 @@
 		//cbo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));銆�
 		if(authUser) {
 			// 瑕佹眰鏄剧ず璐﹀彿锛屾墍浠ュ仛浜嗘洿鏀�
-			cbo.setCreator(String.valueOf(AuthUtil.getUser().getAccount()));
-			cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
+			cbo.setCreator(String.valueOf(user.getAccount()));
+			cbo.setLastModifier(String.valueOf(user.getAccount()));
 		}else{
 			cbo.setCreator(orderDTO.getCreator());
 			cbo.setLastModifier(orderDTO.getLastModifier());
 		}
-		cbo.setTenantId(AuthUtil.getTenantId());
+		cbo.setTenantId(user.getTenantId());
 		if(StringUtils.isNotBlank(orderDTO.getLcStatus())||StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){
 			cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus"));
 		}
@@ -554,7 +556,7 @@
         cbo.setDescription(orderDTO.getDescription());
         cboList.add(cbo);
 
-        List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList);
+        List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList,user);
 
         batchSaveSelectChar(templateVO, cboList);
         return codeList.size() > 0 ? codeList.get(0) : "";

--
Gitblit v1.9.3