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

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -744,5 +744,9 @@ public interface CommonMapper {
 
     IPage<PgAppraiseApplyVO> appraiseApplyList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<WorkerNumberCheckVO> workerManagerCheck(Page page,@Param("ex") WorkerParamBean zfireParamBean);
+
+    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
+    Integer workerManagerCheckCount(@Param("ex")WorkerParamBean zfireParamBean);
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -1012,9 +1012,10 @@ public class WorkerManagerLogic {
         FieldUtils.supplyParam(zfireParamBean, WorkerNumberCheckVO.class, commonLogic.getAdminUser());
         zfireParamBean.setAdminWebsitIds(zfireParamBean.getAdminWebsitIds());
 
-        IPage<WorkerNumberCheckVO> page = commonMapper.workerManagerCheck(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()),
+        IPage<WorkerNumberCheckVO> page = commonMapper.workerManagerCheck(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize(),false),
                 zfireParamBean);
-
+        Integer count = commonMapper.workerManagerCheckCount(zfireParamBean);
+        page.setTotal(count);
         return page;
 
     }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1610,7 +1610,6 @@
         worker_number_check a
         LEFT JOIN admin_websit b on a.websit_id = b.websit_id
         LEFT JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
-        LEFT JOIN websit_user d on d.websit_id = a.websit_id and d.user_id = c.user_id
         ${ex.query}
         <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.websit_id IN
@@ -1618,11 +1617,36 @@
                 #{item}
             </foreach>
         </if>
+        HAVING a.worker_number_yun != c.worker_number or c.worker_number is null
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>
         ${ex.orderBy}
     </select>
+    <select id="workerManagerCheckCount" resultType="java.lang.Integer">
+        SELECT
+        COUNT( 1 )
+        FROM
+        (
+        SELECT
+        a.worker_number_yun,
+        c.worker_number
+        FROM
+        worker_number_check a
+        LEFT JOIN admin_websit b on a.websit_id = b.websit_id
+        LEFT JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
+        ${ex.query}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        HAVING a.worker_number_yun != c.worker_number or c.worker_number is null
+        ) s
+
+
+    </select>
 
 
 </mapper>