From b195c53ca948f3c7a36d4dac7afc4052889ebd0a Mon Sep 17 00:00:00 2001 From: zhangfh Date: Mon, 30 Aug 2021 19:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/ApiAppUserController.java | 1 - .../esua/epdc/feign/fallback/UserFeignClientFallback.java | 1 - .../java/com/elink/esua/epdc/service/AppUserService.java | 1 - .../com/elink/esua/epdc/service/impl/AdminServiceImpl.java | 6 +++--- .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 1 - 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 5073d7c..b4cbb4c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -11,7 +11,6 @@ import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; -import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index ba8a146..d9a4044 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -11,7 +11,6 @@ import com.elink.esua.epdc.dto.UserWxFormIdDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO; import com.elink.esua.epdc.feign.UserFeignClient; import org.springframework.stereotype.Component; diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 9dac126..6f8e5d6 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -9,7 +9,6 @@ import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; -import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index 0153ea0..2c700cb 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -127,10 +127,10 @@ public class AdminServiceImpl implements AdminService { @Override public Result> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) { - /*if(null == userDetail){ + if(null == userDetail){ return new Result>().error("获取Token信息失败"); - }*/ - //formDto.setDeptId(userDetail.getDeptId()); + } + formDto.setDeptId(userDetail.getDeptId()); return adminFeignClient.getGridmanList(formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 8b939dd..f841e0c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -31,7 +31,6 @@ import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; -import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; import com.elink.esua.epdc.enums.AppUserAuditStateEnum;