议题项目分类管理 优化

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java

@@ -29,6 +29,7 @@ import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -155,5 +156,5 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Author zhangyong
      * @Date 14:10 2021-03-22
      **/
-    List<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
+    LinkedList<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java

@@ -54,10 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -394,6 +391,9 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         entity.setPid(formDTO.getParentCategoryId());
         entity.setPids(formDTO.getParentCategoryId());
         IssueProjectCategoryDictDTO parentCategoryCode = baseDao.selectByCustomerId(formDTO.getCustomerId(),formDTO.getParentCategoryId());
+        if (null == parentCategoryCode) {
+            throw new RenException(String.format("获取一级分类信息失败，入参[客户id: %s, 一级分类Id: %s]",formDTO.getCustomerId(),formDTO.getParentCategoryId()));
+        }
         entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
         // 查询 当前客户下最大的一级分类数。
         Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());
@@ -431,8 +431,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
 
     @Override
     public List<CustomerCategoryResultDTO> customerCategoryList(String customerId) {
-        List<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
-        List<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
+        LinkedList<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
+        LinkedList<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
 
         for (CustomerCategoryResultDTO p : parentCategoryDict) {
             List<CustomerCategoryResultDTO> children = new ArrayList<>();