获取分类接口入参去掉客户Id，改为在token中获取

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CustomerCategoryListFormDTO.java

@@ -1,22 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * 分类列表查询-接口入参
- * @Author sun
- */
-@Data
-public class CustomerCategoryListFormDTO implements Serializable {
-
-    private static final long serialVersionUID = 2599592072265715951L;
-    @NotBlank(message = "客户ID不能为空",groups = {CustomerCategoryListFormDTO.Category.class})
-    private String customerId;
-
-    public interface Category{}
-
-
-}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueProjectCategoryDictController.java

@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -27,7 +29,6 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.CategoryTagInitFormDTO;
-import com.epmet.dto.form.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
@@ -97,15 +98,14 @@ public class IssueProjectCategoryDictController {
     }
 
     /**
-     * @param formDTO
+     * @param tokenDto
      * @return
      * @Description 客户分类列表查询，按分类升序排列
      * @Author sun
      **/
     @PostMapping("list")
-    public Result<List<CustomerCategoryListResultDTO>> categoryList(@RequestBody CustomerCategoryListFormDTO formDTO) {
+    public Result<List<CustomerCategoryListResultDTO>> categoryList(@LoginUser TokenDto tokenDto) {
-        ValidatorUtils.validateEntity(formDTO, CustomerCategoryListFormDTO.Category.class);
+        return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(tokenDto.getCustomerId()));
-        return new Result<List<CustomerCategoryListResultDTO>>().ok(issueProjectCategoryDictService.categoryList(formDTO));
     }
 
     /**

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

@@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.CategoryTagInitFormDTO;
-import com.epmet.dto.form.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
 import com.epmet.dto.result.ProjectIssueCategoryResultDTO;
@@ -99,12 +98,12 @@ public interface IssueProjectCategoryDictService extends BaseService<IssueProjec
     void delete(String[] ids);
 
     /**
-     * @param formDTO
+     * @param customerId
      * @return
      * @Description 客户分类列表查询，按分类升序排列
      * @Author sun
      **/
-    List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO);
+    List<CustomerCategoryListResultDTO> categoryList(String customerId);
 
     /**
      * 客户分类标签数据初始化

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

@@ -29,7 +29,6 @@ import com.epmet.dao.IssueProjectRelationDao;
 import com.epmet.dto.IssueDTO;
 import com.epmet.dto.IssueProjectCategoryDictDTO;
 import com.epmet.dto.form.CategoryTagInitFormDTO;
-import com.epmet.dto.form.CustomerCategoryListFormDTO;
 import com.epmet.dto.form.ProjectSaveCategoryFormDTO;
 import com.epmet.dto.form.SaveIssueCategoryFormDTO;
 import com.epmet.dto.result.CustomerCategoryListResultDTO;
@@ -121,14 +120,14 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
     }
 
     /**
-     * @param formDTO
+     * @param customerId
      * @return
      * @Description 客户分类列表查询，按分类升序排列
      * @Author sun
      **/
     @Override
-    public List<CustomerCategoryListResultDTO> categoryList(CustomerCategoryListFormDTO formDTO) {
+    public List<CustomerCategoryListResultDTO> categoryList(String customerId) {
-        List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(formDTO.getCustomerId());
+        List<CustomerCategoryListResultDTO> resultList = baseDao.selectCustomerCategoryList(customerId);
         return resultList;
     }