elink-star
/
epdc-cloud-api-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

代码提交 bug代码更新

origin/dept_screen
zhangfh 4 years ago
parent
f311b8132a
commit
adf4f97ede
10 changed files with 5 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
  2. 1
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
  3. 2
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
  4. 1
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  5. 2
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
  6. 1
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
  7. 3
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java
  8. 1
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java
  9. 3
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
  10. 1
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

2
epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java
View File

@ -4,7 +4,7 @@ import com.elink.esua.epdc.common.token.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
import com.elink.esua.epdc.service.AdminService;
import org.springframework.beans.factory.annotation.Autowired;

1
epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
View File

@ -8,7 +8,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
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.form.*;
import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;

2
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
View File

@ -7,8 +7,8 @@ import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.SysUserDTO;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;

1
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
View File

@ -9,7 +9,6 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
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.feign.fallback.UserFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;

2
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
View File

@ -8,8 +8,8 @@ import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.SysUserDTO;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
import com.elink.esua.epdc.feign.AdminFeignClient;
import org.springframework.stereotype.Component;

1
epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
View File

@ -10,7 +10,6 @@ import com.elink.esua.epdc.dto.UserGridRelationDTO;
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.feign.UserFeignClient;
import org.springframework.stereotype.Component;

3
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java
View File

@ -1,9 +1,8 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;

1
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java
View File

@ -6,7 +6,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.*;
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.EpdcAppRegisterCallbackDTO;

3
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
@ -10,7 +9,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.DeptOption;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO;
import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO;
import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;

1
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
View File

@ -26,7 +26,6 @@ import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.*;
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.group.form.GroupUserFormDTO;
import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;

Write Preview
Loading…
Cancel
Save