修改用户待审核列表

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -110,7 +110,7 @@ public class WorkUserServiceImpl implements WorkUserService {
 
     /***
      * 获取用户待审核列表
-     * @param userDetail
+     * @param
      * @param workUserFromDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
      * @author qushutong
@@ -118,7 +118,7 @@ public class WorkUserServiceImpl implements WorkUserService {
      */
     @Override
     public Result<List<EpdcWorkUserResultDTO>> listWorkUser(EpdcWorkUserFromDTO workUserFromDto) {
-        if (null == workUserFromDto.getGridId()) {
+        if (null == workUserFromDto.getGridId()||0 == workUserFromDto.getGridId()) {
             UserDetail user = SecurityUser.getUser();
             workUserFromDto.setGridIdList(user.getDeptIdList());
         }
@@ -158,7 +158,7 @@ public class WorkUserServiceImpl implements WorkUserService {
     }
 
     /**
-     * @param userDetail
+     * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
      * @Author yinzuomei
      * @Description 首页面板 获取工作端APP菜单

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

@@ -266,12 +266,12 @@
             epdc_user_grid_relation ug
             LEFT JOIN epdc_user u ON ug.USER_ID = u.ID
         WHERE
-            u.PART_FLAG = #{partyFlag}
+            u.PARTY_FLAG = #{partyFlag}
             AND u.STATE = #{authenticatedFlag}
             AND u.DEL_FLAG = '0'
             AND ug.DEL_FLAG = '0'
             <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=")" >