代码提交 党员亮身份代码更新

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;

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;
 

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;
 

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<List<EpdcAppGridManListResultDTO>> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) {
-        /*if(null == userDetail){
+        if(null == userDetail){
           return  new Result<List<EpdcAppGridManListResultDTO>>().error("获取Token信息失败");
-        }*/
+        }
-        //formDto.setDeptId(userDetail.getDeptId());
+        formDto.setDeptId(userDetail.getDeptId());
         return adminFeignClient.getGridmanList(formDto);
     }
 }

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;