From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期四, 13 七月 2023 11:40:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 c78da18..3b51169 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 @@ -6,6 +6,7 @@ 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; @@ -49,7 +50,10 @@ baseModel.setLastR("1"); baseModel.setLastV("1"); baseModel.setRevisionSeq(1); - baseModel.setOwner("1"); + if(Func.isBlank(baseModel.getOwner())){ + // 璁剧疆鎵�鏈夎�� + baseModel.setOwner(AuthUtil.getUserId().toString()); + } baseModel.setVersionSeq(1); baseModel.setVersionRule("0"); baseModel.setVersionValue("1"); -- Gitblit v1.9.3