Commit 0a22701c by guojuxing

delete_flag规范修改引起的问题修复

parent 174a6372
......@@ -5,6 +5,7 @@ import com.gic.bizdict.api.dto.BizdictDTO;
import com.gic.bizdict.api.service.BizdictService;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.constant.DeleteFlagConstants;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.dto.rule.*;
import com.gic.enterprise.entity.*;
......@@ -240,12 +241,12 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
if (isNotRightRuleLevel(record.getRuleLevel(), TWO)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误,不是分类类型");
}
configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(0));
configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(DeleteFlagConstants.DELETE_STATUS));
//删除下面的场景
List<TabConfigRule> list = configRuleService.listRule(null, 3, ruleId);
if (CollectionUtils.isNotEmpty(list)) {
for (TabConfigRule tabConfigRule : list) {
configRuleService.update(new TabConfigRule().setRuleId(tabConfigRule.getRuleId()).setDeleteFlag(0));
configRuleService.update(new TabConfigRule().setRuleId(tabConfigRule.getRuleId()).setDeleteFlag(DeleteFlagConstants.DELETE_STATUS));
}
}
return ServiceResponse.success(record.getRuleName());
......@@ -260,7 +261,7 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
if (isNotRightRuleLevel(record.getRuleLevel(), THREE)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "场景ID错误,不是场景类型");
}
configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(0));
configRuleService.update(new TabConfigRule().setRuleId(ruleId).setDeleteFlag(DeleteFlagConstants.DELETE_STATUS));
return ServiceResponse.success(record.getRuleName());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment