From 4d1876b8c498921ddc57934e28009fc0bd6feb33 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 19 Oct 2021 16:49:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E9=85=8D=E7=BD=AE=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/slrs/sarPosition/dao/TsPositionDao.java    |  8 ++++++++
 .../service/impl/TsPositionServiceImpl.java       |  5 +++--
 .../mapper/sarPosition/TsPositionMapper.xml       | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java
index df811c59..29e87b98 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java
@@ -57,6 +57,14 @@ public interface TsPositionDao extends BaseMapper<TsPosition> {
      */
     List<TsPosition> selectPositionAndRole(TsPosition tsPosition);
 
+    /**
+     * 总数
+     * @param tsPosition
+     * @return
+     */
+    Integer countPositionAndRole(TsPosition tsPosition);
+
+
     /**
      * 通过岗位列表查询绑定的角色列表
      * @param positionIds：岗位列表
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java
index 0c57e382..f34b3081 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java
@@ -44,9 +44,10 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
     @Override
     public IPage<TsPosition> getPosition(TsPosition tsPosition) {
         IPage page=new Page();
-
-        page.setTotal(tsPositionDao.pageTotal());
+//        page.setTotal(tsPositionDao.pageTotal());
+        page.setTotal(tsPositionDao.countPositionAndRole(tsPosition));
         page.setRecords(tsPositionDao.selectPositionAndRole(tsPosition));
+        page.setTotal(page.getTotal());
         page.setCurrent(tsPosition.getCurrent());
         page.setSize(tsPosition.getPageSize());
         System.out.println(page.getTotal());
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
index 59141adc..236c04fd 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
@@ -31,12 +31,27 @@
             <if test="name!=null">
                 p.name like concat(concat('%',#{name}),'%')
             </if>
+            order by locate(#{name},p.name)
         </where>
         <if test=" null!= pageSize  ">
         limit ${(current-1) * pageSize},${pageSize}
         </if>
     </select>
 
+
+    <select id="countPositionAndRole" resultType="java.lang.Integer">
+        select count(1) from ts_position p
+        left join ts_position_role pr
+        on p.id=pr.position_id
+        left join ts_role r
+        on pr.role_id=r.id
+        <where>
+            <if test="name!=null">
+                p.name like concat(concat('%',#{name}),'%')
+            </if>
+        </where>
+    </select>
+
     <select id="pageTotal" resultType="Long">
         select count(1) as total from ts_position
     </select>