查询form配置微调

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java

@@ -17,9 +17,7 @@
 
 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;
@@ -32,6 +30,7 @@ import com.epmet.dto.form.CustomerFormQueryDTO;
 import com.epmet.dto.result.CustomerFormResultDTO;
 import com.epmet.excel.IcFormExcel;
 import com.epmet.service.IcFormService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -49,7 +48,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("icform")
 public class IcFormController {
-    
+
     @Autowired
     private IcFormService icFormService;
 
@@ -100,15 +99,17 @@ public class IcFormController {
      * 获取居民信息表单
      *
      * @param formDto
-     * @return  com.epmet.commons.tools.utils.Result<CustomerFormResultDTO> 
-     * @author yinzuomei 
+     * @return  com.epmet.commons.tools.utils.Result<CustomerFormResultDTO>
+     * @author yinzuomei
      * @date 2021/10/26 2:40 下午
      */
     @PostMapping("getcustomerform")
-    public Result<CustomerFormResultDTO> getCustomerForm(@LoginUser TokenDto tokenDto, @RequestBody CustomerFormQueryDTO formDto){
-        formDto.setCustomerId(tokenDto.getCustomerId());
+    public Result<CustomerFormResultDTO> getCustomerForm(@RequestHeader String customerId, @RequestBody CustomerFormQueryDTO formDto){
+        if (StringUtils.isBlank(formDto.getCustomerId())){
+            formDto.setCustomerId(customerId);
+        }
         ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class);
         return new Result<CustomerFormResultDTO>().ok(icFormService.getCustomerForm(formDto));
 
     }
-}
+}