Source/BladeX/blade-service/blade-code/src/main/java/org/springblade/code/service/impl/CodeBasicSecServiceImpl.java

@@ -1,22 +1,8 @@
package org.springblade.code.service.impl;


import com.alibaba.fastjson.JSONObject;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
import com.vci.mdm.constant.MdmBtmTypeConstant;
import com.vci.mdm.dao.CodeBasicSecDaoI;
import com.vci.mdm.dao.CodeClassifyValueDaoI;
import com.vci.mdm.dao.CodeFixedValueDaoI;
import com.vci.mdm.dto.CodeBasicSecDTO;
import com.vci.mdm.enumpack.CodeSecTypeEnum;
import com.vci.mdm.lifecycle.CodeRuleLC;
import com.vci.mdm.model.CodeBasicSecDO;
import com.vci.mdm.model.CodeClassifyValueDO;
import com.vci.mdm.model.CodeFixedValueDO;
import com.vci.mdm.pagemodel.CodeBasicSecVO;
import com.vci.mdm.pagemodel.CodeClassifyValueVO;
import com.vci.mdm.pagemodel.CodeFixedValueVO;
import com.vci.mdm.pagemodel.CodeRuleVO;
import com.vci.mdm.service.*;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.constant.QueryOptionConstant;
@@ -28,14 +14,31 @@
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.enumpck.OsCodeFillTypeEnum;
import com.vci.web.pageModel.BatchCBO;
import com.vci.web.pageModel.KeyValue;
import com.vci.web.pageModel.UIFormReferVO;
import com.vci.web.service.BdSelectInputCharServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.code.constant.MdmBtmTypeConstant;
import org.springblade.code.dao.CodeBasicSecDaoI;
import org.springblade.code.dao.CodeClassifyValueDaoI;
import org.springblade.code.dao.CodeFixedValueDaoI;
import org.springblade.code.dto.CodeBasicSecDTO;
import org.springblade.code.enumpack.CodeSecTypeEnum;
import org.springblade.code.lifecycle.CodeRuleLC;
import org.springblade.code.model.CodeBasicSecDO;
import org.springblade.code.model.CodeClassifyValueDO;
import org.springblade.code.model.CodeFixedValueDO;
import org.springblade.code.service.CodeBasicSecServiceI;
import org.springblade.code.service.CodeClassifyValueServiceI;
import org.springblade.code.service.CodeFixedValueServiceI;
import org.springblade.code.service.CodeRuleServiceI;
import org.springblade.code.vo.pagemodel.CodeBasicSecVO;
import org.springblade.code.vo.pagemodel.CodeClassifyValueVO;
import org.springblade.code.vo.pagemodel.CodeFixedValueVO;
import org.springblade.code.vo.pagemodel.CodeRuleVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -414,7 +417,7 @@
        deleteSet.addAll(batchCBO.getDeleteCbos());
        if (CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(codeBasicSecDO.getSecType())){
            conditionMap.put("codefixedsecoid",codeBasicSecDO.getOid());
            VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeFixedValueDO.class);
            VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, CodeFixedValueDO.class);
            List<CodeFixedValueDO> fixedValueDOS = fixedValueMapper.selectByWrapper(wrapper);
            BatchCBO valueCBO = fixedValueMapper.batchDeleteByOids(fixedValueDOS.stream().map(CodeFixedValueDO::getOid).collect(Collectors.toSet()));
            deleteSet.addAll(valueCBO.getDeleteCbos());