yuxc
2023-09-06 272033302ba80cafe52cd56da59ce2798ca8f2c1
修改了报错提示拦截,以xml加租户
已修改4个文件
35 ■■■■ 文件已修改
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -41,7 +41,7 @@
     * @param plCodeClassify
     * @return
     */
    List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify);
    List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify,@Param("tenantId") String tenantId);
    /**
     * 查找子类
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -45,6 +45,7 @@
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.cache.NacosConfigCache;
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,8 +85,8 @@
    @Resource
    private IBtmTypeClient btmTypeClient;
    @Value("${user-info.tenant-id}")
    private String tenantId;
    @Resource
    private NacosConfigCache nacosConfigCache;
    /**
     * 日志
@@ -126,7 +127,12 @@
    @Override
    public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
        return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
        return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify,AuthUtil.getTenantId()
            .equals(
                nacosConfigCache
                    .getAdminUserInfo()
                    .getTenantId()
            ) ? null:AuthUtil.getTenantId()));
    }
    /**
@@ -518,9 +524,19 @@
        }
        if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
            doList = codeClassifyMapper
                .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
                .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId()
                    .equals(
                        nacosConfigCache
                            .getAdminUserInfo()
                            .getTenantId()
                    ) ? null:AuthUtil.getTenantId());
        }else{
            doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
            doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId()
                .equals(
                    nacosConfigCache
                        .getAdminUserInfo()
                        .getTenantId()
                ) ? null:AuthUtil.getTenantId());
        }
        List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
        TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -951,7 +951,7 @@
            return (BaseModel) valueWrapper.get();
        } catch (Exception e) {
            logger.error("创建业务类型对象", e);
            throw new VciBaseException("initBtmError", new String[]{btmName});
            throw new ServiceException("initBtmError:"+"业务类型:"+btmName+":"+e.getMessage());
        }
    }
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -46,6 +46,9 @@
    <select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
        select * from PL_CODE_CLASSIFY where is_deleted = 0
        <if test="tenantId != null and tenantId != ''">
            and tenant_id = #{tenantId}
        </if>
    </select>
    <select id="selectAllLevelChildOid" resultType="java.util.HashMap">
@@ -362,7 +365,7 @@
        </if>
        <if test="tenantId != null and tenantId != ''">
            codeclassify0.tenant_id = #{tenantId}
            and codeclassify0.tenant_id = #{tenantId}
        </if>
        order by id asc
    </select>