Sfoglia il codice sorgente

微信客户bug修复

dongxin 11 mesi fa
parent
commit
d56bb9aa9a

+ 1 - 2
linkwe-chinacoal/src/main/resources/mapper/modules/bdshdb/customer/LocalAppUserMapper.xml

@@ -14,7 +14,7 @@
         FROM local_app_user as lau
         FROM local_app_user as lau
         LEFT JOIN local_ordinary_user_process loup ON lau.ordinary_user_id = loup.ordinary_user_id
         LEFT JOIN local_ordinary_user_process loup ON lau.ordinary_user_id = loup.ordinary_user_id
         <where>
         <where>
-            lau.user_type = 1 and lau.del_flag = 0
+            lau.user_type = 1 and lau.del_flag = 0 and lau.is_formal is not null
             <if test="localAppUserDto.startDate != null and localAppUserDto.endDate != null">
             <if test="localAppUserDto.startDate != null and localAppUserDto.endDate != null">
                 AND date_format(lau.create_time,'%Y-%m-%d')
                 AND date_format(lau.create_time,'%Y-%m-%d')
                 BETWEEN
                 BETWEEN
@@ -24,6 +24,5 @@
                 AND lau.open_id is not null
                 AND lau.open_id is not null
             </if>
             </if>
         </where>
         </where>
-        limit 10
     </select>
     </select>
 </mapper>
 </mapper>

+ 0 - 1
linkwe-chinacoal/src/main/resources/mapper/modules/jzgdb/customer/SysUserJzgMapper.xml

@@ -18,6 +18,5 @@
                 date_format(#{sysUserDto.startDate},'%Y-%m-%d') AND date_format(#{sysUserDto.endDate},'%Y-%m-%d')
                 date_format(#{sysUserDto.startDate},'%Y-%m-%d') AND date_format(#{sysUserDto.endDate},'%Y-%m-%d')
             </if>
             </if>
         </where>
         </where>
-        limit 10
     </select>
     </select>
 </mapper>
 </mapper>

+ 6 - 6
linkwe-service/src/main/resources/mapper/wecom/WeCustomerUserMapper.xml

@@ -7,13 +7,13 @@
     <select id="findWeCustomerUserListIds" resultType="java.lang.String">
     <select id="findWeCustomerUserListIds" resultType="java.lang.String">
         SELECT wcu.id FROM we_customer_user wcu
         SELECT wcu.id FROM we_customer_user wcu
         <where>
         <where>
-            <if test="weCustomerUserList.wxOpenid != null">
+            <if test="weCustomerUserList.wxOpenid != null and weCustomerUserList.wxOpenid !=  ''">
                 AND wcu.wx_openid = #{weCustomerUserList.wxOpenid}
                 AND wcu.wx_openid = #{weCustomerUserList.wxOpenid}
             </if>
             </if>
-            <if test="weCustomerUserList.userCode != null">
+            <if test="weCustomerUserList.userCode != null and weCustomerUserList.userCode != ''">
                 AND wcu.user_code = #{weCustomerUserList.userCode}
                 AND wcu.user_code = #{weCustomerUserList.userCode}
             </if>
             </if>
-            <if test="weCustomerUserList.wxNickname != null">
+            <if test="weCustomerUserList.wxNickname != null and weCustomerUserList.wxNickname != ''">
                 AND wcu.wx_nickname = #{weCustomerUserList.wxNickname}
                 AND wcu.wx_nickname = #{weCustomerUserList.wxNickname}
             </if>
             </if>
             <if test="weCustomerUserList.status != null">
             <if test="weCustomerUserList.status != null">
@@ -34,13 +34,13 @@
         count(0)
         count(0)
         FROM we_customer_user wcu
         FROM we_customer_user wcu
         <where>
         <where>
-            <if test="weCustomerUserList.wxOpenid != null">
+            <if test="weCustomerUserList.wxOpenid != null and weCustomerUserList.wxOpenid !=  ''">
                 AND wcu.wx_openid = #{weCustomerUserList.wxOpenid}
                 AND wcu.wx_openid = #{weCustomerUserList.wxOpenid}
             </if>
             </if>
-            <if test="weCustomerUserList.userCode != null">
+            <if test="weCustomerUserList.userCode != null and weCustomerUserList.userCode != ''">
                 AND wcu.user_code = #{weCustomerUserList.userCode}
                 AND wcu.user_code = #{weCustomerUserList.userCode}
             </if>
             </if>
-            <if test="weCustomerUserList.wxNickname != null">
+            <if test="weCustomerUserList.wxNickname != null and weCustomerUserList.wxNickname != ''">
                 AND wcu.wx_nickname = #{weCustomerUserList.wxNickname}
                 AND wcu.wx_nickname = #{weCustomerUserList.wxNickname}
             </if>
             </if>
             <if test="weCustomerUserList.status != null">
             <if test="weCustomerUserList.status != null">