From c784a40346a05f893c59589e92dee60ba431f991 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期三, 11 十月 2023 10:01:32 +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 | 4 ++-- 1 files changed, 2 insertions(+), 2 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 106b325..e1f4796 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 @@ -36,7 +36,7 @@ public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException { BaseModel baseModel = object; try { - baseModel.setOid(VciBaseUtil.getPk().toUpperCase()); + baseModel.setOid(VciBaseUtil.getPk()); baseModel.setCreateTime(new Date()); baseModel.setNameOid(VciBaseUtil.getPk()); baseModel.setLastModifyTime(new Date()); @@ -45,7 +45,7 @@ //鐢ㄦ埛id String userId = AuthUtil.getUserId().toString(); baseModel.setBtmname(btmName); - baseModel.setCreator(userId); + baseModel.setCreator(AuthUtil.getUser().getAccount()); baseModel.setFirstR("1"); baseModel.setFirstV("1"); baseModel.setLastR("1"); -- Gitblit v1.9.3