diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 7d5d8c59d..5c94e35fe 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java @@ -310,8 +310,8 @@ public class EpdcAppUserController { * @date 2019/11/19 13:25 */ @GetMapping("unauthorizedAmount") - public Result unauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { - return userService.getAnauthorizedAmount(fromDto); + public Result unauthorizedAmount(@RequestBody EpdcUnauthorizedAmountFromDTO fromDto) { + return userService.getUnauthorizedAmount(fromDto); } /** * 获取邀请记录 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 86038c5f6..c7cabf455 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -146,7 +146,7 @@ public interface UserDao extends BaseDao { * @author qushutong * @date 2019/11/19 13:31 */ - int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); + int selectCountUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index dd8b4dc5f..1d86bda92 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -237,6 +237,6 @@ public interface UserService extends BaseService { * @author qushutong * @date 2019/11/19 13:28 */ - Result getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); + Result getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index c75ce1af7..c2bfffbb5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -658,8 +658,8 @@ public class UserServiceImpl extends BaseServiceImpl implem } @Override - public Result getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { - return new Result().ok(baseDao.selectOneAnauthorizedAmount(fromDto)); + public Result getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) { + return new Result().ok(baseDao.selectCountUnauthorizedAmount(fromDto)); } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 2bf99703d..e3e014a76 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -277,7 +277,7 @@ AND u.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' - AND ug.GRID_ID = #{gridId} + AND ug.GRID_ID = #{gridId} AND ug.GRID_ID in @@ -292,7 +292,7 @@ - SELECT COUNT(DISTINCT(u.ID)) FROM @@ -300,7 +300,7 @@ LEFT JOIN epdc_user u ON u.ID = ug.USER_ID WHERE u.DEL_FLAG = '0' AND ug.DEL_FLAG = '0' AND u.STATE = '1' - AND ug.GRID_ID = #{gridId} + AND ug.GRID_ID = #{gridId} AND ug.GRID_ID in