From 5eda82798190ea0cd01a9d7c3aa669625dddc920 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 27 Apr 2020 10:14:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/DepartmentService.java | 1 - .../com/epmet/modules/member/redis/ResiGroupMemberRedis.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java index b2562ef67a..fe941cca10 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java @@ -19,7 +19,6 @@ package com.epmet.service; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.CustomerIdDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java index 9285e70f54..4ddcf25a3b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java @@ -17,12 +17,9 @@ package com.epmet.modules.member.redis; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.map.MapUtil; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO; import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO; import org.apache.commons.lang3.StringUtils; From f0211219c082fb75d03475e4631a1768ace96c7d Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 27 Apr 2020 13:01:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=88=97=E8=A1=A8Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/GridController.java | 4 ++-- .../src/main/resources/mapper/CustomerStaffAgencyDao.xml | 2 +- .../src/main/resources/mapper/StaffRoleDao.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index bc751b6e88..553644d00a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -79,7 +79,7 @@ public class GridController { **/ @PostMapping("gridlist") public Result gridList(@LoginUser TokenDto tokenDto,@RequestBody CommonAgencyIdFormDTO agencyFormDTO){ - agencyFormDTO.setAgencyId(tokenDto.getUserId()); + agencyFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(agencyFormDTO); return customerGridService.getGridListByAgency(agencyFormDTO); } @@ -93,7 +93,7 @@ public class GridController { **/ @PostMapping("allgrids") public Result> allGrids(@LoginUser TokenDto tokenDto, @RequestBody CommonAgencyIdFormDTO agencyFormDTO){ - agencyFormDTO.setAgencyId(tokenDto.getUserId()); + agencyFormDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(agencyFormDTO); return customerGridService.getAllGridsByAgency(agencyFormDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml index 5183cf79b6..9f09e6ab22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml @@ -58,7 +58,7 @@ AND agency.USER_ID NOT IN ( SELECT - grid2.USER_ID + USER_ID FROM CUSTOMER_STAFF_GRID WHERE diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml index 718e47a182..088bd0478f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml @@ -63,7 +63,7 @@ role.DEL_FLAG = '0' AND staff.DEL_FLAG = '0' AND rolename.DEL_FLAG = '0' - AND staff.ID = #{userId} + AND staff.USER_ID = #{userId} AND staff.CUSTOMER_ID = #{customerId} \ No newline at end of file