fix 修改pageHelper()确保不会被污染ThreadLocal

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java

@@ -46,7 +46,6 @@ public class CzrkController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(Czrk czrk) {
-        startPage();
         List<Czrk> list = czrkService.listByCzrk(czrk);
         return getDataTable(list);
     }
@@ -206,7 +205,6 @@ public class CzrkController extends BaseController {
      */
     @PostMapping("/unusualList")
     public TableDataInfo unusualList(@RequestBody Czrk czrk) {
-        startPage();
         List<Czrk> list = czrkService.unusualList(czrk);
         return getDataTable(list);
     }

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkJzdzController.java

@@ -35,7 +35,6 @@ public class CzrkJzdzController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('system:jzdz:list')")
     @GetMapping("/list")
     public TableDataInfo list(Czrk czrk) {
-        startPage();
         List<Czrk> list = czrkJzdzService.listByCzrkJzdz(czrk);
         return getDataTable(list);
     }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkJzdzServiceImpl.java

@@ -3,6 +3,9 @@ package com.boman.web.core.service.czrk;
 import com.alibaba.fastjson.JSON;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;
+import com.boman.common.core.utils.sql.SqlUtil;
+import com.boman.common.core.web.page.PageDomain;
+import com.boman.common.core.web.page.TableSupport;
 import com.boman.domain.Czrk;
 import com.boman.domain.CzrkJzdz;
 import com.boman.domain.SysUser;
@@ -10,6 +13,7 @@ import com.boman.web.core.mapper.CzrkJzdzMapper;
 import com.boman.web.core.mapper.CzrkMapper;
 import com.boman.web.core.utils.AuthUtils;
 import com.boman.web.core.utils.CzrkUtils;
+import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -178,6 +182,7 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
         //当前用户只能看到居住地址在当前的人员
         setQueryRole(czrk,sysUser,Czrk.CZ);
         long startTimeSql = System.currentTimeMillis();
+        startPage();
         List<Czrk> czrks = czrkMapper.listByCzrkJzdz(czrk);
         long endTimeSql = System.currentTimeMillis() - startTimeSql;
         log.info("执行查询人员信息中常住人员的sql语句时间:" + endTimeSql + "ms");
@@ -204,4 +209,14 @@ public class CzrkJzdzServiceImpl implements ICzrkJzdzService {
 
         return czrkJzdzMapper.listByCzrkId(czrkId);
     }
+
+    private void startPage() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
 }

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -2,7 +2,6 @@ package com.boman.web.core.service.czrk;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.constant.HttpStatus;
@@ -29,7 +28,6 @@ import com.boman.web.core.service.ip.IpTimesService;
 import com.boman.web.core.utils.*;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.BooleanUtils;
 import org.apache.tomcat.util.buf.HexUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,15 +35,12 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-
 import javax.annotation.Resource;
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 import static com.boman.common.core.utils.StringUtils.isNotEmpty;
 import static com.boman.common.core.utils.fieldTranslator.IdCardUtils.getSex;
 import static com.boman.common.core.utils.obj.ObjectUtils.*;
@@ -178,6 +173,7 @@ public class CzrkServiceImpl implements ICzrkService {
         //设置权限
         setQueryRole(czrk, sysUser, Czrk.HJ);
         long startTimeSql = System.currentTimeMillis();
+        startPage();
         List<Czrk> czrks = czrkMapper.unusualList(czrk);
         long endTimeSql = System.currentTimeMillis() - startTimeSql;
         log.info("执行查询异常人员sql语句时间:" + endTimeSql + "ms");

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -1051,7 +1051,7 @@
 
 
     <select id="selectCzrkByCode" resultType="java.lang.Integer" resultMap="CzrkResult">
-       select id_card from czrk where is_del = 'N' and code = #{code} and house_type = '是' limit 1;
+       select id_card from czrk where is_del = 'N' and code = #{code} and house_type = '是' limit 1
     </select>
 
 
@@ -1068,7 +1068,7 @@
 
     <select id="selectCzrkByIdCard" resultType="java.lang.String" resultMap="CzrkResult">
         <include refid="selectCzrkVo"/>
-        where is_del = 'N' and id_card = #{idCard} limit 1;
+        where is_del = 'N' and id_card = #{idCard} limit 1
     </select>
 
     <select id="selectLost" resultMap="CzrkResult">