未认证居民和党员库首次进入列表页面，不进行默认查询

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java

@@ -17,7 +17,6 @@
 
 package com.elink.esua.epdc.controller;
 
-import cn.hutool.core.map.MapUtil;
 import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
@@ -31,7 +30,6 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.excel.PartyMembersExcel;
 import com.elink.esua.epdc.service.PartyMembersService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -54,6 +52,14 @@ public class PartyMembersController {
     @Autowired
     private PartyMembersService partyMembersService;
 
+    /**
+     * 党员库
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.PartyMembersDTO>>
+     * @author
+     * @date 2020/2/24 15:16
+     */
     @GetMapping("page")
     public Result<PageData<PartyMembersDTO>> page(@RequestParam Map<String, Object> params) {
         return partyMembersService.pageDIY(params);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -41,9 +42,10 @@ import com.elink.esua.epdc.entity.UserEntity;
 import com.elink.esua.epdc.enums.PartyMemberRegFlagEnum;
 import com.elink.esua.epdc.excel.PartyMembersExcel;
 import com.elink.esua.epdc.feign.AdminFeignClient;
-import com.elink.esua.epdc.redis.PartyMembersRedis;
 import com.elink.esua.epdc.service.PartyMembersService;
 import com.elink.esua.epdc.service.PartyTagRelationService;
+import com.elink.esua.epdc.util.AppUserUtils;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,8 +64,6 @@ import java.util.*;
 @Service
 public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, PartyMembersEntity> implements PartyMembersService {
 
-    @Autowired
-    private PartyMembersRedis partyMembersRedis;
     @Autowired
     private PartyTagRelationService partyTagRelationService;
 
@@ -81,6 +81,12 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
     @Override
     public Result<PageData<PartyMembersDTO>> pageDIY(Map<String, Object> params) {
+        String[] paramKeys = new String[]{"realName", "mobile", "streetId", "communityId", "gridId", "identityNo", "registFlag", "postId", "startTime", "endTime"};
+        if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+            List<PartyMembersDTO> list = Lists.newArrayList();
+            return new Result().ok(new PageData<>(list, NumConstant.ZERO));
+        }
+
         params = preparePageParams(params);
         IPage<PartyMembersDTO> page = getPage(params);
         List<PartyMembersDTO> list = baseDao.pageDIY(params);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.service.impl;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -32,8 +33,6 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
-import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
-import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
@@ -65,14 +64,14 @@ import com.elink.esua.epdc.excel.UserExcel;
 import com.elink.esua.epdc.exception.UserModuleErrorCode;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.*;
-import io.seata.spring.annotation.GlobalTransactional;
+import com.elink.esua.epdc.util.AppUserUtils;
+import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotBlank;
 import java.io.File;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -110,10 +109,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
+        String state = MapUtil.getStr(params, "state");
+        String partyFlag = MapUtil.getStr(params, "partyFlag");
+        // 上边两个值都为0，表示查询未认证居民列表
+        if (YesOrNoEnum.NO.value().equals(state) && YesOrNoEnum.NO.value().equals(partyFlag)) {
+            String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
+            if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
+                List<UserDTO> userDtoList = Lists.newArrayList();
+                return new PageData<>(userDtoList, NumConstant.ZERO);
+            }
+        }
         this.verifyParams(params);
-        Long userId = SecurityUser.getUserId();
         // 查询当前用户所具有的的数据权限
-        UserDetail userDetail = userDetailRedis.get(userId);
         IPage<UserDTO> iPage = this.getPage(params);
         List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params);
         return new PageData<>(userDtoList, iPage.getTotal());

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/util/AppUserUtils.java

@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.util;
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ArrayUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
+
+/**
+ * 一些公用方法
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/24 15:23
+ */
+public class AppUserUtils {
+
+    /**
+     * 是否是进入页面时的首次查询
+     *
+     * @param params    页面分页参数
+     * @param paramKeys 查询条件的属性名 如：realName,startTime,endTime
+     * @return boolean
+     * @author work@yujt.net.cn
+     * @date 2020/2/24 15:27
+     */
+    public static boolean isDefaultQuery(Map<String, Object> params, String[] paramKeys) {
+        if (ArrayUtil.isEmpty(paramKeys)) {
+            return true;
+        }
+        for (String paramKey : paramKeys) {
+            if (StringUtils.isNotBlank(MapUtil.getStr(params, paramKey))) {
+                return false;
+            }
+        }
+        return true;
+    }
+}