1、主要对修改主题库分类接口报错问题进行了修改与测试以及对之前存入人员编号改为了人员id
已修改1个文件
27 ■■■■■ 文件已修改
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -47,7 +47,7 @@
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
@@ -131,11 +131,11 @@
        if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
            return R.fail("只有在顶层的主题库分类才能设置业务类型");
        }
        codeClassifyEntity.setCreator(AuthUtil.getUser().getUserName());
        codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
        codeClassifyEntity.setCreateTime(new Date());
        codeClassifyEntity.setTs(new Date());
        codeClassifyEntity.setOwner(AuthUtil.getUser().getUserName());
        codeClassifyEntity.setLastModifier(AuthUtil.getUser().getUserName());
        codeClassifyEntity.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
        codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
        codeClassifyEntity.setLastModifyTime(new Date());
        codeClassifyEntity.setRevisionSeq(1);
        codeClassifyEntity.setVersionSeq(1);
@@ -154,20 +154,17 @@
            return R.fail("传入数据不能为空!");
        }
        //检查ts
        Map<String,Object> condition = new HashMap<>(2);
        condition.put("oid",codeClassifyEntity.getOid());
        condition.put("ts",codeClassifyEntity.getTs());
        CodeClassify detail = codeClassifyMapper
            .selectOne(Condition.getQueryWrapper(condition,CodeClassify.class));
        if(detail == null){//不是最新的不让改
        CodeClassify detail = codeClassifyMapper.selectById(codeClassifyEntity.getOid());
        if(!detail.getTs().toString().equals(codeClassifyEntity.getTs().toString())){//不是最新的不让改
            return R.fail("当前数据不是最新,请刷新后再修改!");
        }
        if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
            return R.fail("只有在顶层的主题库分类才能设置业务类型");
        }
        codeClassifyEntity.setLastModifier(AuthUtil.getUser().getUserName());
        codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
        codeClassifyEntity.setLastModifyTime(new Date());
        codeClassifyEntity.setTs(new Date());
        int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
//         //处理数据集成逻辑,成功后执行集成第一步,分类数据特殊处理。只有启用状态的分类才推送
@@ -354,7 +351,7 @@
        codeClassify.setLcStatus(lcStatus);
        codeClassify.setTs(new Date());
        codeClassify.setLastModifyTime(new Date());
        codeClassify.setLastModifier(AuthUtil.getUser().getUserName());
        codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
        //启用、停用
//        int u = codeClassifyMapper.updateLcStatus(oid,lcStatus);
        int count = codeClassifyMapper.updateById(codeClassify);
@@ -900,9 +897,9 @@
                    classifyDO.setTs(new Date());
                    classifyDO.setBtmname("codeclassify");
                    classifyDO.setLcStatus("Enabled");
                    classifyDO.setOwner(AuthUtil.getUser().getUserName());
                    classifyDO.setCreator(AuthUtil.getUser().getUserName());
                    classifyDO.setLastModifier(AuthUtil.getUser().getUserName());
                    classifyDO.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
                    classifyDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
                    classifyDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
                    classifyDO.setLastModifyTime(new Date());
                    codeClassifyMapper.insert(classifyDO);
                }