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

@@ -42,24 +42,29 @@
         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(userId);
         baseModel.setCreator(AuthUtil.getUser().getAccount());
         baseModel.setFirstR("1");
         baseModel.setFirstV("1");
         baseModel.setLastR("1");
         baseModel.setLastV("1");
         baseModel.setRevisionSeq(1);
         // TODO:目前只有编码规则中有用到，后期需要去掉这段代码的话，就把他加在编码规则新增中去
         if(Func.isBlank(baseModel.getOwner())){
            // 设置所有者
            baseModel.setOwner(AuthUtil.getUserId().toString());
         }

         baseModel.setVersionSeq(1);
         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());
      }catch (VciBaseException e){
         e.printStackTrace();
      }
@@ -78,9 +83,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();
      }
@@ -127,8 +134,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",""));
@@ -149,7 +156,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();