From ee5b60c2c7b661fd2b6934427a57b30650852886 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 27 Apr 2020 13:42:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9@Datafilter=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=EF=BC=8C=E5=B0=86tableAlias=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=95=B0=E7=BB=84=EF=BC=8C=E9=A2=84=E7=95=99=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=EF=BC=8C=E4=B8=BA=E5=90=8E=E9=9D=A2=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/mybatis/annotation/DataFilter.java | 2 +- .../com/epmet/commons/mybatis/aspect/DataFilterAspect.java | 3 ++- .../src/main/java/com/epmet/dao/StaffRoleDao.java | 3 +++ .../main/java/com/epmet/service/impl/StaffRoleServiceImpl.java | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java index 96b7691f22..6947d92619 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/annotation/DataFilter.java @@ -23,6 +23,6 @@ public @interface DataFilter { /** * 表的别名 */ - String tableAlias() default ""; + String[] tableAliases() default ""; } diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java index c9965192cf..a7c5fc1683 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/aspect/DataFilterAspect.java @@ -71,7 +71,8 @@ public class DataFilterAspect { // 通过反射，取到注解属性 DataFilter dataFilterAnno = ((MethodSignature) point.getSignature()).getMethod().getAnnotation(DataFilter.class); - String tableAlias = dataFilterAnno.tableAlias(); + String[] tableAliases = dataFilterAnno.tableAliases(); + String tableAlias = tableAliases[0]; // 从ThreadLocal中取所需权限 String requirePermission = AccessOpeAspect.requirePermissionTl.get(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java index 85dae3de67..b943b44be7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java @@ -17,6 +17,7 @@ package com.epmet.dao; +import com.epmet.commons.mybatis.annotation.DataFilter; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.dto.StaffRoleDTO; @@ -44,6 +45,7 @@ public interface StaffRoleDao extends BaseDao { * @param orgId * @return */ + //@DataFilter(tableAliases = { "sr" }) List listStaffIdsByRoleKeyAndOrgId(@Param("roleKey") String roleKey, @Param("orgId") String orgId, @Param("dataScope") DataScope dataScope); @@ -61,6 +63,7 @@ public interface StaffRoleDao extends BaseDao { * @Author wangc * @Date 2020.04.26 11:01 **/ + //@DataFilter(tableAliases = { "role" }) StaffRolesResultDTO getStaffRoles(CommonUserFormDTO commonUserFormDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java index 0c4365e9fb..f76d6545c5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java @@ -114,7 +114,6 @@ public class StaffRoleServiceImpl extends BaseServiceImpl listStaffsInRole(String roleKey, String orgId, DataScope dataScope) { return baseDao.listStaffIdsByRoleKeyAndOrgId(roleKey, orgId, dataScope); } @@ -133,7 +132,6 @@ public class StaffRoleServiceImpl extends BaseServiceImpl getStaffRoles(CommonUserFormDTO userParam) { return new Result().ok(baseDao.getStaffRoles(userParam)); } From 67bf61d20976f603a3acc829336ea424139bb85b Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 27 Apr 2020 15:29:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3Bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 4 ++-- .../java/com/epmet/dto/form/CommonUserIdListFormDTO.java | 2 +- .../src/main/resources/mapper/CustomerStaffDao.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 7af8c21e98..e5873c263f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -233,8 +233,8 @@ SELECT USER_ID AS staffId, - REAL_NAME AS staffName, - HEAD_PHOTO AS staffHeadPhoto , - GENDER + IFNULL(REAL_NAME,"") AS staffName, + IFNULL(HEAD_PHOTO,"") AS staffHeadPhoto , + IFNULL(GENDER,0) AS gender FROM CUSTOMER_STAFF WHERE From c029d692934b0b77bf3bc96456e483cc98a85cea Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 27 Apr 2020 17:45:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E7=BB=87-=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=20bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/StaffInfoResultDTO.java | 2 ++ .../java/com/epmet/dto/result/StaffRoleResultDTO.java | 7 ++++++- .../main/java/com/epmet/controller/StaffController.java | 7 ++----- .../main/java/com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../feign/fallback/EpmetUserFeignClientFallBack.java | 2 +- .../src/main/java/com/epmet/service/StaffService.java | 7 ++----- .../java/com/epmet/service/impl/StaffServiceImpl.java | 9 +++------ .../com/epmet/controller/CustomerStaffController.java | 8 ++------ .../java/com/epmet/service/CustomerStaffService.java | 8 ++------ .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 8 +++----- .../src/main/resources/mapper/CustomerStaffDao.xml | 3 ++- 11 files changed, 26 insertions(+), 37 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInfoResultDTO.java index 2859c1171a..3e6647a9a0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInfoResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInfoResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import java.io.Serializable; @@ -34,5 +35,6 @@ public class StaffInfoResultDTO implements Serializable { /** * 权限名 */ + @JsonInclude(JsonInclude.Include.NON_NULL) private String roleName; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java index eea1e50dbe..987cde9e3e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java @@ -1,6 +1,6 @@ package com.epmet.dto.result; -import lombok.Builder; +import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import java.io.Serializable; @@ -21,8 +21,13 @@ public class StaffRoleResultDTO implements Serializable { * 角色名称 */ private String roleName; + /** + * true，false专职可选全部 + */ + private String fullTimeOnly; /** * 是否选中(选中的是true) */ + @JsonInclude(JsonInclude.Include.NON_NULL) private Boolean selected; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 6964cffec3..39bb61a691 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -8,10 +8,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.StaffInfoFromDTO; import com.epmet.dto.form.StaffSubmitFromDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; -import com.epmet.dto.result.StaffDetailResultDTO; -import com.epmet.dto.result.StaffInfoResultDTO; -import com.epmet.dto.result.StaffInitResultDTO; -import com.epmet.dto.result.StaffsInAgencyResultDTO; +import com.epmet.dto.result.*; import com.epmet.service.StaffService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -61,7 +58,7 @@ public class StaffController { * @return Result */ @PostMapping("rolelist") - public Result addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ + public Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ return staffService.addStaffInit(fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 9f9638ae34..6680257b47 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -83,7 +83,7 @@ public interface EpmetUserFeignClient { * @return Result */ @PostMapping("/epmetuser/customerstaff/rolelist") - Result addStaffInit(@RequestBody StaffInfoFromDTO fromDTO); + Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO); /** * 人员编辑页面初始化 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java index 639d83d1b5..7765bda523 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java @@ -63,7 +63,7 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { } @Override - public Result addStaffInit(StaffInfoFromDTO fromDTO) { + public Result> addStaffInit(StaffInfoFromDTO fromDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffInit", fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java index e11e8edecb..09e783e520 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java @@ -5,10 +5,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.StaffInfoFromDTO; import com.epmet.dto.form.StaffSubmitFromDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; -import com.epmet.dto.result.StaffDetailResultDTO; -import com.epmet.dto.result.StaffInfoResultDTO; -import com.epmet.dto.result.StaffInitResultDTO; -import com.epmet.dto.result.StaffsInAgencyResultDTO; +import com.epmet.dto.result.*; import java.util.List; @@ -43,7 +40,7 @@ public interface StaffService { * @param fromDTO 参数 * @return Result */ - Result addStaffInit(StaffInfoFromDTO fromDTO); + Result> addStaffInit(StaffInfoFromDTO fromDTO); /** * 人员编辑页面初始化 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index dcdb8087f7..3cff5ccff6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -8,10 +8,7 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.StaffInfoFromDTO; import com.epmet.dto.form.StaffSubmitFromDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; -import com.epmet.dto.result.StaffDetailResultDTO; -import com.epmet.dto.result.StaffInfoResultDTO; -import com.epmet.dto.result.StaffInitResultDTO; -import com.epmet.dto.result.StaffsInAgencyResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerStaffAgencyEntity; import com.epmet.feign.EpmetUserFeignClient; @@ -53,7 +50,7 @@ public class StaffServiceImpl implements StaffService { resultDTO.setStaffCount(0); return new Result().ok(resultDTO); } - resultDTO.setStaffCount(customerAgencyEntity.getTotalUser()); + resultDTO.setStaffCount(customerAgencyEntity.getTotalUser() == null ? 0 : customerAgencyEntity.getTotalUser()); fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); List customerStaffAgencyList = customerStaffAgencyService.getCustomerStaffAgencyList(fromDTO).getData(); if (null == customerStaffAgencyList || customerStaffAgencyList.size() == 0) { @@ -89,7 +86,7 @@ public class StaffServiceImpl implements StaffService { } @Override - public Result addStaffInit(StaffInfoFromDTO fromDTO) { + public Result> addStaffInit(StaffInfoFromDTO fromDTO) { CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId()); fromDTO.setCustomerId(customerAgencyEntity.getCustomerId()); return epmetUserFeignClient.addStaffInit(fromDTO); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index 37d59a6225..bc9166904b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -31,15 +31,11 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.StaffGridListDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.DepartInStaffListResultDTO; -import com.epmet.dto.result.StaffDetailResultDTO; -import com.epmet.dto.result.StaffInfoResultDTO; -import com.epmet.dto.result.StaffInitResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.StaffGridListDTO; import com.epmet.dto.form.CustomerStaffFormDTO; -import com.epmet.dto.result.CommonStaffInfoResultDTO; import com.epmet.excel.CustomerStaffExcel; import com.epmet.service.CustomerStaffService; import org.springframework.beans.factory.annotation.Autowired; @@ -197,7 +193,7 @@ public class CustomerStaffController { * @return Result */ @PostMapping("rolelist") - public Result addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ + public Result> addStaffInit(@RequestBody StaffInfoFromDTO fromDTO){ return customerStaffService.addStaffInit(fromDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index 67a4b279ef..65e4bcdd76 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -32,11 +32,7 @@ import com.epmet.dto.form.StaffInfoFromDTO; import com.epmet.dto.form.StaffSubmitFromDTO; import com.epmet.dto.form.DepartmentInStaffFormDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; -import com.epmet.dto.result.StaffDetailResultDTO; -import com.epmet.dto.result.DepartInStaffListResultDTO; -import com.epmet.dto.result.StaffInfoResultDTO; -import com.epmet.dto.result.StaffInitResultDTO; -import com.epmet.dto.result.CommonStaffInfoResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.CustomerStaffEntity; import java.util.List; @@ -165,7 +161,7 @@ public interface CustomerStaffService extends BaseService { * @param fromDTO 参数 * @return Result */ - Result addStaffInit(StaffInfoFromDTO fromDTO); + Result> addStaffInit(StaffInfoFromDTO fromDTO); /** * 人员编辑页面初始化 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 28e22a28f7..eba870a094 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -201,13 +201,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl addStaffInit(StaffInfoFromDTO fromDTO) { - StaffInitResultDTO resultDTO = new StaffInitResultDTO(); + public Result> addStaffInit(StaffInfoFromDTO fromDTO) { GovStaffRoleDTO govStaffRoleDTO = new GovStaffRoleDTO(); govStaffRoleDTO.setCustomerId(fromDTO.getCustomerId()); List roleList = govStaffRoleService.getGovStaffRoleList(govStaffRoleDTO); if (null == roleList || roleList.size() == 0) { - return new Result().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); + return new Result>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg()); } List staffRoleList = roleList.stream().map(p -> { StaffRoleResultDTO staffRoleResultDTO = new StaffRoleResultDTO(); @@ -215,8 +214,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl().ok(resultDTO); + return new Result>().ok(staffRoleList); } @Override diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index f322594f33..a0acecdc79 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -64,7 +64,7 @@ cs.GENDER AS "gender", IFNULL( cs.HEAD_PHOTO, "" ) AS "staffHeadPhoto", cs.ENABLE_FLAG AS "enableFlag", - role.ROLE_NAME AS "roleName" + IFNULL( role.ROLE_NAME, "" ) AS "roleName" FROM customer_staff cs LEFT JOIN ( @@ -85,6 +85,7 @@ WHERE cs.DEL_FLAG = '0' AND cs.CUSTOMER_ID = #{customerId} + AND cs.ENABLE_FLAG = 'enable' AND cs.USER_ID IN #{userId}