From dea2325896c7f8bd7df5107569b71d15fede79c7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 九月 2022 20:11:55 +0800
Subject: [PATCH] 1、优化图片异步上传2、bug修复3、合同bug修复4、车场相关问题
---
java110-db/src/main/resources/mapper/user/PrivilegeUserV1ServiceDaoImplMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/PrivilegeUserV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/PrivilegeUserV1ServiceDaoImplMapper.xml
index 33ff11d..bf56660 100644
--- a/java110-db/src/main/resources/mapper/user/PrivilegeUserV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/PrivilegeUserV1ServiceDaoImplMapper.xml
@@ -165,6 +165,9 @@
<!-- 鏌ヨ鐢ㄦ埛鏉冮檺鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryStaffsNoRoleCount" parameterType="Map" resultType="Map">
+ <if test="orgIds != null and orgIds.length > 0">
+ select count(*) count from (
+ </if>
select count(1) count
from u_user t
inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
@@ -177,14 +180,18 @@
<if test="userName !=null and userName != ''">
and t.name like concat('%', #{userName},'%')
</if>
+ and su.store_id = #{storeId}
<if test="orgIds != null and orgIds.length > 0">
and uosr.org_id in
<foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
AND uosr.status_cd = '0'
+ group by t.user_id
</if>
- and su.store_id = #{storeId}
+ <if test="orgIds != null and orgIds.length > 0">
+ )a
+ </if>
</select>
<!-- 鏌ヨ鐢ㄦ埛鏉冮檺淇℃伅 add by wuxw 2018-07-03 -->
@@ -204,14 +211,15 @@
<if test="userName !=null and userName != ''">
and t.name like concat('%', #{userName},'%')
</if>
+ and su.store_id = #{storeId}
<if test="orgIds != null and orgIds.length > 0">
and uosr.org_id in
<foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
AND uosr.status_cd = '0'
+ group by t.user_id
</if>
- and su.store_id = #{storeId}
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
--
Gitblit v1.8.0