From 6c4db89ea8795d6be8431f698051e62bec9ec956 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期五, 07 五月 2021 09:06:08 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
index d9dcf5f..73c5f10 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -57,14 +57,14 @@
             "com_pb_member m\n" +
             "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
             "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
-            " where m.community_id=#{pagePartyOrganizationVO.communityId} " +
-            "<if test='pagePartyOrganizationVO.orgName != null and pagePartyOrganizationVO.orgName.trim() != &quot;&quot;'>" +
+            " where m.community_id=#{pagePartyOrganizationVO.communityId} and m.audit_result='1' " +
+            "<if test='pagePartyOrganizationVO.orgName != null and pagePartyOrganizationVO.orgName != &quot;&quot;'>" +
             "and o.name like concat(#{pagePartyOrganizationVO.orgName},'%') "+
             " </if> " +
-            "<if test='pagePartyOrganizationVO.account != null and pagePartyOrganizationVO.account.trim() != &quot;&quot;'>" +
+            "<if test='pagePartyOrganizationVO.account != null and pagePartyOrganizationVO.account != &quot;&quot;'>" +
             "and u.phone like concat (#{pagePartyOrganizationVO.account},'%')"+
             " </if> " +
-            "<if test='pagePartyOrganizationVO.name != null and pagePartyOrganizationVO.name.trim() != &quot;&quot;'>" +
+            "<if test='pagePartyOrganizationVO.name != null and pagePartyOrganizationVO.name != &quot;&quot;'>" +
             "and m.name like concat (#{pagePartyOrganizationVO.name},'%')"+
             " </if> " +
 
@@ -106,14 +106,14 @@
             "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
             "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
             " where m.user_id is not null  " +
-            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone.trim() != &quot;&quot;'>" +
+            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone != &quot;&quot;'>" +
             "and u.phone = #{pagePartyBuildingMemberVO.phone} "+
             " </if> " +
-            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name.trim() != &quot;&quot;'>" +
+            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name != &quot;&quot;'>" +
             "and u.name like concat (#{pagePartyBuildingMemberVO.name},'%')"+
             " </if> " +
-            "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus.trim() != &quot;&quot;'>" +
-            "and m.audit_status = #{pagePartyBuildingMemberVO.auditStatus}"+
+            "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus != &quot;&quot;'>" +
+            "and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}"+
             " </if> " +
             "order by m.join_time desc "+
             "</script>")
@@ -144,14 +144,14 @@
             "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
             "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
             " where m.audit_result in (0,3)  " +
-            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone.trim() != &quot;&quot;'>" +
-            " and u.phone = #{pagePartyBuildingMemberVO.phone} "+
+            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone != &quot;&quot;'>" +
+            " and u.phone LIKE CONCAT('%',#{pagePartyBuildingMemberVO.phone},'%') "+
             " </if> " +
-            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name.trim() != &quot;&quot;'>" +
-            " and u.name like concat (#{pagePartyBuildingMemberVO.name},'%')"+
+            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name != &quot;&quot;'>" +
+            " and u.name like concat ('%',#{pagePartyBuildingMemberVO.name},'%')"+
             " </if> " +
-            "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus.trim() != &quot;&quot;'>" +
-            " and m.audit_status = #{pagePartyBuildingMemberVO.auditStatus}"+
+            "<if test='pagePartyBuildingMemberVO.auditStatus != null'>" +
+            " and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}"+
             " </if> " +
             " order by m.join_time desc "+
             "</script>")

--
Gitblit v1.7.1