From a47e724d0d6ba3222e82b6a9ef955aa9b069d159 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 21:18:52 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 383a2aa..181134b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -4,17 +4,12 @@
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import org.apache.poi.ss.formula.functions.T;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
-
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -33,7 +28,7 @@
 	 * @return
 	 * @throws VciBaseException
 	 */
-	public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
+	public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName) throws VciBaseException {
 		BaseModel baseModel = object;
 		try {
 			baseModel.setOid(VciBaseUtil.getPk());
@@ -42,8 +37,6 @@
 			baseModel.setLastModifyTime(new Date());
 			baseModel.setTs(new Date());
 			baseModel.setRevisionOid(VciBaseUtil.getPk());
-			// 鐢ㄦ埛id
-			// String userId = AuthUtil.getUserId().toString();
 			baseModel.setBtmname(btmName);
 			baseModel.setCreator(AuthUtil.getUser().getAccount());
 			baseModel.setFirstR("1");
@@ -86,8 +79,7 @@
 			// 鐢ㄦ埛id
 			// String userId = AuthUtil.getUserId().toString();
 			// 瑕佹眰鏀规垚璐﹀彿
-			String account = AuthUtil.getUserAccount();
-			baseModel.setLastModifier(account);
+			baseModel.setLastModifier(AuthUtil.getUser().getAccount());
 		}catch (VciBaseException e){
 			e.printStackTrace();
 		}
@@ -112,7 +104,7 @@
 				Object value=dataMap.get(key);
 				newDataMap.put(key.toLowerCase(Locale.ROOT),value);
 			}*/
-		/*	dataMap.forEach((key,value)->{
+			/*	dataMap.forEach((key,value)->{
 				newDataMap.put(key.toLowerCase(Locale.ROOT),value);
 			});*/
 			//baseModel.setData((Map)newDataMap);
@@ -167,6 +159,7 @@
 			}
 		}catch (VciBaseException e){
 			e.printStackTrace();
+			throw e;
 		}
 		return (T)baseModel;
 	}

--
Gitblit v1.9.3