push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiConditionConfigServiceImpl.java

@@ -82,6 +82,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
             throw new BusinessException("同类型下条件名称已存在");
             throw new BusinessException("同类型下条件名称已存在");
         }
         }
         ConditionConfig conditionConfig = new ConditionConfig();
         ConditionConfig conditionConfig = new ConditionConfig();
+        BeanUtils.copyProperties(request,conditionConfig);
         conditionConfig.setConditionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_CONDITION_CONFIG.getCode()));
         conditionConfig.setConditionBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_CONDITION_CONFIG.getCode()));
         //条件编码
         //条件编码
         conditionConfig.setCode(CodeGenerator.generate10Code(CodeGeneratorConstants.PREFIX_CONDITION_CODE));
         conditionConfig.setCode(CodeGenerator.generate10Code(CodeGeneratorConstants.PREFIX_CONDITION_CODE));
@@ -108,6 +109,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
         if (!CollectionUtils.isEmpty(conditionConfigList)) {
         if (!CollectionUtils.isEmpty(conditionConfigList)) {
             throw new BusinessException("同类型下条件名称已存在");
             throw new BusinessException("同类型下条件名称已存在");
         }
         }
+        BeanUtils.copyProperties(request,conditionConfig);
         iConditionConfigService.saveOrUpdate(conditionConfig);
         iConditionConfigService.saveOrUpdate(conditionConfig);
         return Result.success();
         return Result.success();
     }
     }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiConditionTypeServiceImpl.java

@@ -72,6 +72,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
             throw new BusinessException("条件类型名称已存在");
             throw new BusinessException("条件类型名称已存在");
         }
         }
         ConditionType conditionType = new ConditionType();
         ConditionType conditionType = new ConditionType();
+        BeanUtils.copyProperties(request,conditionType);
         conditionType.setConditionTypeBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_CONDITION_TYPE.getCode()));
         conditionType.setConditionTypeBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_CONDITION_TYPE.getCode()));
         //编码
         //编码
         conditionType.setCode(CodeGenerator.generate10Code(CodeGeneratorConstants.PREFIX_CONDITION_TYPE_CODE));
         conditionType.setCode(CodeGenerator.generate10Code(CodeGeneratorConstants.PREFIX_CONDITION_TYPE_CODE));
@@ -97,6 +98,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
         if (!CollectionUtils.isEmpty(conditionTypeList)) {
         if (!CollectionUtils.isEmpty(conditionTypeList)) {
             throw new BusinessException("条件类型名称已存在");
             throw new BusinessException("条件类型名称已存在");
         }
         }
+        BeanUtils.copyProperties(request,conditionType);
         iConditionTypeService.saveOrUpdate(conditionType);
         iConditionTypeService.saveOrUpdate(conditionType);
         return Result.success();
         return Result.success();
     }
     }

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiVariableServiceImpl.java

@@ -146,6 +146,9 @@ public class ApiVariableServiceImpl implements ApiVariableService {
      */
      */
     @Override
     @Override
     public Result edit(ApiVariableEditRequest request) {
     public Result edit(ApiVariableEditRequest request) {
+        //校验变量信息是否存在
+        Result<Variable> result = checkVariableIsExist(request.getVariableBizId());
+        Variable variable = result.getData();
         //校验变量中文名唯一性
         //校验变量中文名唯一性
         List<Variable> variableList = iVariableService.queryList(VariableDto.builder()
         List<Variable> variableList = iVariableService.queryList(VariableDto.builder()
                 .nameCn(request.getNameCn())
                 .nameCn(request.getNameCn())
@@ -164,7 +167,6 @@ public class ApiVariableServiceImpl implements ApiVariableService {
         if (!CollectionUtils.isEmpty(variableList1)) {
         if (!CollectionUtils.isEmpty(variableList1)) {
             throw new BusinessException("变量英文名已存在");
             throw new BusinessException("变量英文名已存在");
         }
         }
-        Variable variable = new Variable();
         BeanUtils.copyProperties(request,variable);
         BeanUtils.copyProperties(request,variable);
         iVariableService.saveOrUpdate(variable);
         iVariableService.saveOrUpdate(variable);