Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java

@@ -42,8 +42,8 @@
         baseModel.setLastModifyTime(new Date());
         baseModel.setTs(new Date());
         baseModel.setRevisionOid(VciBaseUtil.getPk());
         //用户id
         String userId = AuthUtil.getUserId().toString();
         // 用户id
         // String userId = AuthUtil.getUserId().toString();
         baseModel.setBtmname(btmName);
         baseModel.setCreator(AuthUtil.getUser().getAccount());
         baseModel.setFirstR("1");
@@ -60,7 +60,7 @@
         baseModel.setVersionRule("0");
         baseModel.setVersionValue("1");
         baseModel.setRevisionOid(VciBaseUtil.getPk());
         baseModel.setLastModifier(userId);
         baseModel.setLastModifier(AuthUtil.getUser().getAccount());
         baseModel.setRevisionValue("1");
         baseModel.setRevisionRule("1");
         baseModel.setTenantId(AuthUtil.getTenantId());
@@ -82,9 +82,11 @@
      try {
         baseModel.setLastModifyTime(new Date());
         baseModel.setTs(new Date());
         //用户id
         String userId = AuthUtil.getUserId().toString();
         baseModel.setLastModifier(userId);
         // 用户id
         // String userId = AuthUtil.getUserId().toString();
         // 要求改成账号
         String account = AuthUtil.getUserAccount();
         baseModel.setLastModifier(account);
      }catch (VciBaseException e){
         e.printStackTrace();
      }
@@ -131,8 +133,8 @@
            baseModel.setTs(chageStringToDate(ts));
         }
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
         //用户id
         String userId = AuthUtil.getUserId().toString();
         //用户id ; 要求改成了账号
         // String userId = AuthUtil.getUserId().toString();
         baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
         baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
         baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
@@ -153,7 +155,7 @@
         baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
         baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
         baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
         baseModel.setLastModifier(userId);
         baseModel.setLastModifier(AuthUtil.getUser().getAccount());

      }catch (VciBaseException e){
         e.printStackTrace();