Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java

@@ -16,7 +16,6 @@
 */
package com.vci.ubcs.code.service.impl;

import com.alibaba.nacos.api.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,6 +40,7 @@
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
@@ -898,11 +898,11 @@

      //所有分类都没有业务类型，返回提示
      if(codeClassifyDOList.size()==0){
         return R.fail("添加模板添加失败,分类和上级分类都没有关联业务类型！");
         return R.fail(DATA_OID_NOT_EXIST);
      }

      //设置btmtypeid和name
      CodeClassify codeClassifyDO = codeClassifyDOList.get(0);
      CodeClassify codeClassifyDO = codeClassifyDOList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId())).findFirst().get();
      codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
      codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
      codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
@@ -1100,9 +1100,13 @@
//            codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
         if(Func.isEmpty(classifyDO)&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
            //说明已经是顶了，也没找到的话，那就返回了
            return null;
            return new ArrayList<>();
         }
         return selectOnlyTemplateByClassifyOid(classifyDO.getParentCodeClassifyOid());
         if(StringUtils.isNotBlank(classifyDO.getParentCodeClassifyOid())) {
            return selectOnlyTemplateByClassifyOid(classifyDO.getParentCodeClassifyOid());
         }else{
            return new ArrayList<>();
         }
      }else{
         return templateDOS;
      }