Browse Source

【部门列表】-【部门列表功能优化】-李鹏飞-20200618

feature/dangjian
李鹏飞 5 years ago
parent
commit
f0167f1451
  1. 2
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  2. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
  3. 20
      esua-epdc/epdc-admin/epdc-cloud-optimize/pom.xml
  4. 2
      esua-epdc/epdc-admin/epdc-optimize-department/pom.xml
  5. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/db/update.sql
  6. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeConstant.java
  7. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeRedisKeys.java
  8. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/OptOssFeignClient.java
  9. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/fallback/OptOssFeignClientFallback.java
  10. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java
  11. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/dao/OptSysDeptDao.java
  12. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/entity/OptSysDeptEntity.java
  13. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/OptSysDeptService.java
  14. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java
  15. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java
  16. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java
  17. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java
  18. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/UploadToOssDTO.java
  19. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java
  20. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java
  21. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java
  22. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/DeptUtils.java
  23. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/FileUtils.java
  24. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/application.yml
  25. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/logback-spring.xml
  26. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/deptlevel/OptSysDeptDao.xml
  27. 0
      esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml
  28. 2
      esua-epdc/epdc-admin/pom.xml

2
esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-cloud-optimize</artifactId>
<artifactId>epdc-optimize-department</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>

2
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@ -411,7 +411,7 @@ public class SysUserController {
* @author work@yujt.net.cn
* @date 2019/11/27 14:31
*/
@GetMapping("deptOptions/getDeptAuthByUser")
@GetMapping("deptOptions/getDeptPartyByUser")
public Result<DeptOption> getDeptPartyByUser() {
UserDetail user = SecurityUser.getUser();
DeptOption deptOption = optSysDeptService.getDeptOption(user.getId(), user.getDeptIdList(),

20
esua-epdc/epdc-admin/epdc-cloud-optimize/pom.xml

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-admin</artifactId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>epdc-cloud-optimize</artifactId>
<packaging>pom</packaging>
<description>党群e家部门机构优化微服务模块</description>
<modules>
<module>epdc-optimize-department</module>
</modules>
</project>

2
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/pom.xml → esua-epdc/epdc-admin/epdc-optimize-department/pom.xml

@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>epdc-cloud-optimize</artifactId>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-admin</artifactId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/db/update.sql → esua-epdc/epdc-admin/epdc-optimize-department/src/db/update.sql

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeConstant.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeConstant.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeRedisKeys.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/constant/OptimizeRedisKeys.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/OptOssFeignClient.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/OptOssFeignClient.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/fallback/OptOssFeignClientFallback.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/feign/fallback/OptOssFeignClientFallback.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/dao/OptSysDeptDao.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/dao/OptSysDeptDao.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/entity/OptSysDeptEntity.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/entity/OptSysDeptEntity.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/OptSysDeptService.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/OptSysDeptService.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/controller/OptDeptMaCodeController.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dao/OptDeptMaCodeDao.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/OptDeptMaCodeDTO.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/UploadToOssDTO.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/dto/UploadToOssDTO.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/entity/OptDeptMaCodeEntity.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/OptDeptMaCodeService.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/macode/service/impl/OptDeptMaCodeServiceImpl.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/DeptUtils.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/DeptUtils.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/FileUtils.java → esua-epdc/epdc-admin/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/utils/FileUtils.java

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/application.yml → esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/application.yml

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/logback-spring.xml → esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/logback-spring.xml

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/mapper/deptlevel/OptSysDeptDao.xml → esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/deptlevel/OptSysDeptDao.xml

0
esua-epdc/epdc-admin/epdc-cloud-optimize/epdc-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml → esua-epdc/epdc-admin/epdc-optimize-department/src/main/resources/mapper/macode/OptDeptMaCodeDao.xml

2
esua-epdc/epdc-admin/pom.xml

@ -16,7 +16,7 @@
<modules>
<module>epdc-admin-client</module>
<module>epdc-admin-server</module>
<module>epdc-cloud-optimize</module>
<module>epdc-optimize-department</module>
</modules>
</project>

Loading…
Cancel
Save