Merge remote-tracking branch 'origin/master'

jwtech-pc/src/main/java/com/kms/web/controller/common/CommonController.java

@@ -143,7 +143,7 @@ public class CommonController
                 String uploadFile = fastdfs.uploadFile(file);
                 AjaxResult ajax = AjaxResult.success();
                 ajax.put("fileName", fileName);
-                ajax.put("url", uploadFile);
+                ajax.put("url", "");
                 return ajax;
             } else {
                 // 上传文件路径
@@ -153,7 +153,7 @@ public class CommonController
                 String url = serverConfig.getUrl() + fileName;
                 AjaxResult ajax = AjaxResult.success();
                 ajax.put("fileName", fileName);
-                ajax.put("url", url);
+                ajax.put("url", "");
                 return ajax;
 
             }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectBidInfoMapper.java

@@ -1,5 +1,7 @@
 package com.kms.earlyStage.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,10 +18,9 @@ import java.util.List;
 @Repository
 public interface SpecialProjectBidInfoMapper extends BaseMapper<SpecialProjectBidInfo> {
 
-    List<SpecialProjectBidInfo> getList(@Param("proNo") String proNo,
-                                        @Param("isConsolidatedBidding") String isConsolidatedBidding,
-                                        @Param("value") String value,
-                                        @Param("orderBy") String orderBy,
-                                        @Param("pageNum") int pageNum,
-                                        @Param("pageSize") int pageSize);
+    IPage<SpecialProjectBidInfo> getList(@Param("proNo") String proNo,
+                                         @Param("isConsolidatedBidding") String isConsolidatedBidding,
+                                         @Param("value") String value,
+                                         @Param("orderBy") String orderBy,
+                                         Page page);
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectFeasibilityMapper.java

@@ -1,5 +1,7 @@
 package com.kms.earlyStage.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -25,13 +27,12 @@ public interface SpecialProjectFeasibilityMapper extends BaseMapper<SpecialProje
                                      @Param("pageNum") int pageNum,
                                      @Param("pageSize") int pageSize);
 
-    List<SpecialProjectFeasibility> getByUserPro(@Param("userId") String userId,
-                                                 @Param("userType") String userType,
-                                                 @Param("id") String id,
-                                                 @Param("projectName") String projectName,
-                                                 @Param("projectCode") String projectCode,
-                                                 @Param("adcd") String adcd,
-                                                 @Param("orderBy") String orderBy,
-                                                 @Param("pageNum") int pageNum,
-                                                 @Param("pageSize") int pageSize);
+    IPage<SpecialProjectFeasibility> getByUserPro(@Param("userId") String userId,
+                                                  @Param("userType") String userType,
+                                                  @Param("id") String id,
+                                                  @Param("projectName") String projectName,
+                                                  @Param("projectCode") String projectCode,
+                                                  @Param("adcd") String adcd,
+                                                  @Param("orderBy") String orderBy,
+                                                  Page page);
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectInfoMapper.java

@@ -1,6 +1,7 @@
 package com.kms.earlyStage.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -27,14 +28,13 @@ public interface SpecialProjectInfoMapper extends BaseMapper<SpecialProjectInfo>
                                      @Param("pageNum") int pageNum,
                                      @Param("pageSize") int pageSize);*/
 
-    List<SpecialProjectInfo> getByUserPro(@Param("userId") String userId,
+    IPage<SpecialProjectInfo> getByUserPro(IPage page,
+            @Param("userId") String userId,
                                           @Param("userType") String userType,
                                           @Param("id") String id,
                                           @Param("projectName") String projectName,
                                           @Param("proNo") String proNO,
                                           @Param("projectType") String projectType,
                                           @Param("adcd") String adcd,
-                                          @Param("orderBy") String orderBy,
-                                          @Param("pageNum") int pageNum,
-                                          @Param("pageSize") int pageSize);
+                                          @Param("orderBy") String orderBy);
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPlanInfoMapper.java

@@ -1,5 +1,7 @@
 package com.kms.earlyStage.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -25,13 +27,12 @@ public interface SpecialProjectPlanInfoMapper extends BaseMapper<SpecialProjectP
                                      @Param("pageNum") int pageNum,
                                      @Param("pageSize") int pageSize);*/
 
-    List<SpecialProjectPlanInfo> getByUserPro(@Param("userId") String userId,
-                                              @Param("userType") String userType,
-                                              @Param("id") String id,
-                                              @Param("planName") String planName,
-                                              @Param("planType") String planType,
-                                              @Param("adcd") String adcd,
-                                              @Param("orderBy") String orderBy,
-                                              @Param("pageNum") int pageNum,
-                                              @Param("pageSize") int pageSize);
+    IPage<SpecialProjectPlanInfo> getByUserPro(@Param("userId") String userId,
+                                               @Param("userType") String userType,
+                                               @Param("id") String id,
+                                               @Param("planName") String planName,
+                                               @Param("planType") String planType,
+                                               @Param("adcd") String adcd,
+                                               @Param("orderBy") String orderBy,
+                                               Page page);
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java

@@ -1,5 +1,7 @@
 package com.kms.earlyStage.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -24,12 +26,11 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper<SpecialProject
                                           @Param("pageNum") int pageNum,
                                           @Param("pageSize") int pageSize);
 
-    List<SpecialProjectPreDesign> getByUserPro(@Param("userId") String userId,
-                                               @Param("userType") String userType,
-                                               @Param("id") String id,
-                                               @Param("projectName") String projectName,
-                                               @Param("adcd") String adcd,
-                                               @Param("orderBy") String orderBy,
-                                               @Param("pageNum") int pageNum,
-                                               @Param("pageSize") int pageSize);
+    IPage<SpecialProjectPreDesign> getByUserPro(@Param("userId") String userId,
+                                                @Param("userType") String userType,
+                                                @Param("id") String id,
+                                                @Param("projectName") String projectName,
+                                                @Param("adcd") String adcd,
+                                                @Param("orderBy") String orderBy,
+                                                Page page);
 }

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectProposalMapper.java

@@ -1,5 +1,7 @@
 package com.kms.earlyStage.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.earlyStage.domain.SpecialProjectInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -28,13 +30,12 @@ public interface SpecialProjectProposalMapper extends BaseMapper<SpecialProjectP
                                      @Param("pageNum") int pageNum,
                                      @Param("pageSize") int pageSize);
 
-    List<SpecialProjectProposal> getByUserPro(@Param("userId") String userId,
-                                              @Param("userType") String userType,
-                                              @Param("id") String id,
-                                              @Param("projectName") String projectName,
-                                              @Param("projectCode") String projectCode,
-                                              @Param("adcd") String adcd,
-                                              @Param("orderBy") String orderBy,
-                                              @Param("pageNum") int pageNum,
-                                              @Param("pageSize") int pageSize);
+    IPage<SpecialProjectProposal> getByUserPro(@Param("userId") String userId,
+                                               @Param("userType") String userType,
+                                               @Param("id") String id,
+                                               @Param("projectName") String projectName,
+                                               @Param("projectCode") String projectCode,
+                                               @Param("adcd") String adcd,
+                                               @Param("orderBy") String orderBy,
+                                               Page page);
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectBidInfoService.java

@@ -84,14 +84,11 @@ public class SpecialProjectBidInfoService extends BaseService<SpecialProjectBidI
 
         Map<String, Object> params = sp.getParams();
 
-        List<SpecialProjectBidInfo> list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(),
-                (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
+        IPage<SpecialProjectBidInfo> list = specialProjectBidInfoMapper.getList(data.getProNo(), data.getIsConsolidatedBidding(), (String) cv.getValue(),
+                (String) params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
 
-        Page<SpecialProjectBidInfo> page = new Page<>();
-        page.setRecords(list);
 
-        page.setTotal(list.size());
 
-        return page;
+        return list;
     }
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectFeasibilityService.java

@@ -45,21 +45,18 @@ public class SpecialProjectFeasibilityService extends BaseService<SpecialProject
         ConditionView cv = sp.getCv();
 
         assert sysUser != null;
-        List<SpecialProjectFeasibility> list = null;
+        IPage<SpecialProjectFeasibility> list = null;
 
 
         if (ObjectUtil.isNull(params)) {
             list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
-                    sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
         }else {
             list = specialProjectFeasibilityMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProjectCode(),
-                    sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
         }
 
-        Page<SpecialProjectFeasibility> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
-        return page;
+        return list;
 
     }
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysUser;
 import com.kms.common.utils.UserUtils;
@@ -27,7 +28,7 @@ import java.util.Map;
  * @date 2023-09-08
  */
 @Service
-public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMapper, SpecialProjectInfo>{
+public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMapper, SpecialProjectInfo> {
 
     @Autowired
     private SpecialProjectInfoMapper specialProjectInfoMapper;
@@ -70,19 +71,18 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
         assert sysUser != null;
         List<SpecialProjectInfo> list = null;
 
+        IPage<SpecialProjectInfo> list1 = null;
 
-            if (ObjectUtil.isNull(params)) {
-                list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(),
-                        data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
-            }else {
-                list = specialProjectInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),data.getProNo(),
-                        data.getProjectType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
-            }
+        if (ObjectUtil.isNull(params)) {
+            list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
+                    data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time");
+        } else {
+            list1 = specialProjectInfoMapper.getByUserPro(new Page(sp.getPageNum(),sp.getPageSize()),sysUser.getId(), sysUser.getUserType(), data.getId(), data.getProjectName(), data.getProNo(),
+                    data.getProjectType(), sysXzqhService.getSubString(sp.getData().getAdcd()), (String) params.get("orderBy"));
+        }
 
-        Page<SpecialProjectInfo> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
-        return page;
+
+        return list1;
 
     }
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPlanInfoService.java

@@ -40,20 +40,18 @@ public class SpecialProjectPlanInfoService extends BaseService<SpecialProjectPla
         Map<String, Object> params = sp.getParams();
 
         assert sysUser != null;
-        List<SpecialProjectPlanInfo> list = null;
+        IPage<SpecialProjectPlanInfo> list = null;
 
         if (ObjectUtil.isNull(params)) {
             list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(),
-                    data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
+                    data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
         }else {
             list = specialProjectPlanInfoMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getPlanName(),
-                    data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+                    data.getPlanType(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
         }
 
-        Page<SpecialProjectPlanInfo> infoPage = new Page<>();
-        infoPage.setRecords(list);
-        infoPage.setTotal(list.size());
-        return infoPage;
+
+        return list;
 
     }
 }

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java

@@ -46,7 +46,7 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
 
 
         assert sysUser != null;
-        List<SpecialProjectPreDesign> list = null;
+        IPage<SpecialProjectPreDesign> list = null;
 
         if (ObjectUtil.isNotNull(data.getProNo())) {
             return specialProjectPreDesignMapper.selectPage(new Page<>(sp.getPageNum(), sp.getPageSize()), BeanToWrapper.getWrapper(sp));
@@ -54,19 +54,15 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
 
         if (ObjectUtil.isNull(params)) {
             list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
-                    sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
         }else {
             list = specialProjectPreDesignMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),data.getProjectName(),
-                    sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+                    sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
         }
 
 
 
-        Page<SpecialProjectPreDesign> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
-
-        return page;
+        return list;
 
 
 

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectProposalService.java

@@ -55,7 +55,7 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
         Map<String, Object> params = sp.getParams();
 
         assert sysUser != null;
-        List<SpecialProjectProposal> list = null;
+        IPage<SpecialProjectProposal> list = null;
 
         if (ObjectUtil.isNull(data.getGetList())) {
             LambdaQueryWrapper<SpecialProjectProposal> wrapper = Wrappers.lambdaQuery(SpecialProjectProposal.class).like(data.getProjectName() != null, SpecialProjectProposal::getProjectName, data.getProjectName())
@@ -68,16 +68,14 @@ public class SpecialProjectProposalService extends BaseService<SpecialProjectPro
 
         if (ObjectUtil.isNull(params)) {
             list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(),
-                    data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",sp.getPageNum(),sp.getPageSize());
+                    data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),"create_time",new Page<>(sp.getPageNum(),sp.getPageSize()));
         }else {
             list = specialProjectProposalMapper.getByUserPro(sysUser.getId(),sysUser.getUserType(),data.getId(),(String) cv.getValue(),
-                    data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),sp.getPageNum(),sp.getPageSize());
+                    data.getProjectCode(),sysXzqhService.getSubString(sp.getData().getAdcd()),(String)params.get("orderBy"),new Page<>(sp.getPageNum(),sp.getPageSize()));
         }
 
-        Page<SpecialProjectProposal> page = new Page<>();
-        page.setRecords(list);
-        page.setTotal(list.size());
-        return page;
+
+        return list;
 
     }
 

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectBidInfoMapper.xml

@@ -33,7 +33,7 @@
 
 
     <select id="getList" resultMap="SpecialProjectBidInfo">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+
         <include refid="info"/>
         <where>
             <if test="proNo!=null and proNo!=''">
@@ -46,7 +46,7 @@
                 and BID_PLAN_NAME like concat('%',#{value},'%')
             </if>
         </where>
-        order by bi.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+        order by bi.${orderBy} desc
     </select>
 
 

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectFeasibilityMapper.xml

@@ -45,7 +45,7 @@
         order by pf.${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>
     <select id="getByUserPro" resultMap="SpecialProjectFeasibility">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+
         <include refid="SpecialProjectInfo"/>
         <if test="userType==01">
             WHERE
@@ -66,7 +66,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by ${orderBy} desc
         </if>
         <if test="userType==00">
             <where>
@@ -78,7 +78,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by ${orderBy} desc
         </if>
     </select>
 </mapper>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectInfoMapper.xml

@@ -66,7 +66,6 @@
     </select>-->
 
     <select id="getByUserPro" resultMap="SpecialProjectInfo">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="info"></include>
         <if test="userType==01">
             WHERE
@@ -90,7 +89,8 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by ${orderBy} desc
+
         </if>
         <if test="userType==00">
             <where>
@@ -105,9 +105,9 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
-        </if>
+            order by ${orderBy} desc
 
+        </if>
 
     </select>
 </mapper>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPlanInfoMapper.xml

@@ -32,7 +32,6 @@
     </resultMap>
 
     <select id="getByUserPro" resultMap="info">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="SpecialProjectPlanInfo"></include>
         <if test="userType==01">
             WHERE
@@ -53,7 +52,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by ${orderBy} desc
         </if>
         <if test="userType==00">
             <where>
@@ -65,7 +64,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by ${orderBy} desc
         </if>
 
     </select>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml

@@ -47,7 +47,7 @@
     </select>
 
     <select id="getByUserPro" resultMap="SpecialProjectPreDesign">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
+
         <include refid="info"/>
         <if test="userType==01">
             WHERE
@@ -66,7 +66,7 @@
 
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by da.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by da.${orderBy} desc
         </if>
         <if test="userType==00">
             <where>
@@ -76,7 +76,7 @@
 
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by da.${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by da.${orderBy} desc
         </if>
     </select>
 </mapper>

jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectProposalMapper.xml

@@ -64,7 +64,6 @@
 
 
     <select id="getByUserPro" resultMap="SpecialProjectProposal">
-        <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="info"></include>
         <if test="userType==01">
             WHERE
@@ -85,7 +84,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by ${orderBy} desc
         </if>
         <if test="userType==00">
             <where>
@@ -97,7 +96,7 @@
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
-            order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
+            order by ${orderBy} desc
         </if>
     </select>
 </mapper>