From 8c70b4c74685b7a1121626e550d1a9666bdb0743 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 18 Oct 2022 13:51:17 +0800
Subject: [PATCH] =?UTF-8?q?/gov/org/customeragency/agencylist=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E8=BF=90=E8=90=A5=E7=AB=AF=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/GetAgencyListFormDTO.java    | 8 ++++++++
 .../com/epmet/controller/CustomerAgencyController.java   | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
index 95c371ad83..64dd258641 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -14,6 +16,12 @@ public class GetAgencyListFormDTO implements Serializable {
 
     private static final long serialVersionUID = -5846836779036328298L;
 
+    /**
+     * 这个接口在运营端统一认证，新增用户事也调用了
+     */
+    public interface OperAddUserShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "运营端调用此接口必须传客户id",groups =OperAddUserShowGroup.class )
     private String customerId;
 
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index c1aba9bb3c..6a8c433250 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -348,8 +349,12 @@ public class CustomerAgencyController {
      */
     @PostMapping("agencylist")
     public Result<AgencyTreeResultDTO> getAgencyList(@LoginUser TokenDto tokenDTO,@RequestBody GetAgencyListFormDTO formDTO) {
-        if (StringUtils.isBlank(formDTO.getCustomerId())){
-            formDTO.setCustomerId(tokenDTO.getCustomerId());
+        if(AppClientConstant.APP_OPER.equals(tokenDTO.getApp())){
+            ValidatorUtils.validateEntity(formDTO.getCustomerId(),GetAgencyListFormDTO.OperAddUserShowGroup.class);
+        }else{
+            if (StringUtils.isBlank(formDTO.getCustomerId())){
+                formDTO.setCustomerId(tokenDTO.getCustomerId());
+            }
         }
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(formDTO));
     }