修改获取待认证用户数量的接口

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<Integer> unauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
+    public Result<Integer> unauthorizedAmount(@RequestBody EpdcUnauthorizedAmountFromDTO fromDto) {
-        return userService.getAnauthorizedAmount(fromDto);
+        return userService.getUnauthorizedAmount(fromDto);
     }
     /**
      * 获取邀请记录

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<UserEntity> {
      * @author qushutong
      * @date 2019/11/19 13:31
      */
-    int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
+    int selectCountUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 
 
 }

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<UserEntity> {
      * @author qushutong
      * @date 2019/11/19 13:28
      */
-    Result<Integer> getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
+    Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 
 }

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<UserDao, UserEntity> implem
     }
 
     @Override
-    public Result<Integer> getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
+    public Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
-        return new Result<Integer>().ok(baseDao.selectOneAnauthorizedAmount(fromDto));
+        return new Result<Integer>().ok(baseDao.selectCountUnauthorizedAmount(fromDto));
     }
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -292,7 +292,7 @@
     </select>
 
     <!--查询待认证用户数量-->
-    <select id="selectOneAnauthorizedAmount" resultType="Integer">
+    <select id="selectCountUnauthorizedAmount" resultType="Integer">
         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'
             <choose>
-                <when test="gridId != null">AND ug.GRID_ID = #{gridId}</when>
+                <when test="gridId != null and gridId > 0">AND ug.GRID_ID = #{gridId}</when>
                 <otherwise>
                     AND ug.GRID_ID in
                     <foreach collection="gridIdList" item="item" open="(" separator="," close=")" >