Merge remote-tracking branch 'origin/yjzx_test' into yjzx_test

src/main/java/com/zzsn/thinktank/controller/ThinktankBasicInfoController.java

@@ -166,8 +166,7 @@ public class ThinktankBasicInfoController {
                                    @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                    HttpServletRequest req) throws Exception {
-        Page<ThinktankBasicInfo> page = new Page<ThinktankBasicInfo>(pageNo, pageSize);
-        IPage<ThinktankBasicInfo> pageList = thinktankBasicInfoService.pageList(page,vo,req);
+        IPage<ThinktankBasicInfo> pageList = thinktankBasicInfoService.pageList(pageNo,pageSize,vo,req);
         return Result.OK(pageList);
     }
 

src/main/java/com/zzsn/thinktank/service/ThinktankBasicInfoService.java

@@ -47,7 +47,7 @@ public interface ThinktankBasicInfoService extends IService<ThinktankBasicInfo>
 
     Result<?> getListBaseData(String id, Integer pageNo, Integer pageSize, Integer office);
 
-    IPage<ThinktankBasicInfo> pageList(Page page, ThinktankBasicInfoListVo vo, HttpServletRequest req) throws Exception;
+    IPage<ThinktankBasicInfo> pageList(Integer pageNo,Integer pageSize,ThinktankBasicInfoListVo vo, HttpServletRequest req) throws Exception;
 
     List<Map<String,Object>> queryStatisticalAnalysis(String type,Page page, ThinktankBasicInfoListVo vo, HttpServletRequest req);
 }

src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java

@@ -797,7 +797,7 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
     }
 
     @Override
-    public IPage<ThinktankBasicInfo> pageList(Page page, ThinktankBasicInfoListVo vo, HttpServletRequest req) throws Exception {
+    public IPage<ThinktankBasicInfo> pageList(Integer pageNo,Integer pageSize,ThinktankBasicInfoListVo vo, HttpServletRequest req) throws Exception {
         QueryWrapper<ThinktankBasicInfo> queryWrapper = new QueryWrapper<>();
         if(vo!=null){
             List<String> fieldTypeId = vo.getFieldTypeId();
@@ -858,7 +858,18 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
             }
         }
         queryWrapper.orderByDesc("update_time");
-        return this.getBaseMapper().selectPage(page,queryWrapper);
+        Integer total = this.getBaseMapper().selectCount(queryWrapper);
+
+        Integer office = pageSize * (pageNo - 1);
+        queryWrapper.last("limit  "+office+", "+pageSize);
+        List<ThinktankBasicInfo> list = this.getBaseMapper().selectList(queryWrapper);
+
+        IPage<ThinktankBasicInfo> page = new Page<>();
+        page.setRecords(list);
+        page.setTotal(total);
+        page.setSize(list.size());
+        page.setCurrent(pageNo);
+        return page;
     }
 
     @Override