From 7c55a6d5a0e7c621b6ba5f3899d356e61d0f04c3 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 28 May 2020 11:29:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E5=85=9A?=
=?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86=20=E3=80=91-=E3=80=90=E5=BE=85?=
=?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98=20sql=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05/27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../epdc-user-server/src/main/resources/mapper/UserDao.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 385948e23..c9dae8a4e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -1249,7 +1249,7 @@
epdc_user uu
where uu.DEL_FLAG = '0'
and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}
- and uu.real_name uu '%${realName}%'
+ and uu.real_name like '%${realName}%'
and uu.NICKNAME like '%${nickname}%'
and uu.mobile like '%${mobile}%'
and uu.identity_no like '%${identityNo}%'
From 8d92d5ed5c516243c678e9c876fda280652446c5 Mon Sep 17 00:00:00 2001
From: Jackwang
Date: Thu, 28 May 2020 11:47:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9=E3=80=91-=E3=80=90=E6=9C=AA?=
=?UTF-8?q?=E8=AE=A4=E8=AF=81=E3=80=81=E5=B7=B2=E8=AE=A4=E8=AF=81=E3=80=81?=
=?UTF-8?q?=E5=BE=85=E8=AE=A4=E8=AF=81=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?=
=?UTF-8?q?=EF=BC=89-2020/05/28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/UserDao.xml | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 385948e23..81d88703c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -643,10 +643,10 @@
#{deptId}
- and u.real_name like '%${realName}%'
- and u.NICKNAME like '%${nickname}%'
- and u.mobile like '%${mobile}%'
- and u.identity_no like '%${identityNo}%'
+ and USER.real_name like '%${realName}%'
+ and USER.NICKNAME like '%${nickname}%'
+ and USER.mobile like '%${mobile}%'
+ and USER.identity_no like '%${identityNo}%'
AND (find_in_set(#{streetId},USER.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},USER.ALL_DEPT_IDS))
@@ -754,10 +754,10 @@
#{deptId}
- and u.real_name like '%${realName}%'
- and u.NICKNAME like '%${nickname}%'
- and u.mobile like '%${mobile}%'
- and u.identity_no like '%${identityNo}%'
+ and user.real_name like '%${realName}%'
+ and user.NICKNAME like '%${nickname}%'
+ and user.mobile like '%${mobile}%'
+ and user.identity_no like '%${identityNo}%'
AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
@@ -848,10 +848,10 @@
#{deptId}
and user.AUTHENTICATED_TYPE is null
- and u.real_name like '%${realName}%'
- and u.NICKNAME like '%${nickname}%'
- and u.mobile like '%${mobile}%'
- and u.identity_no like '%${identityNo}%'
+ and user.real_name like '%${realName}%'
+ and user.NICKNAME like '%${nickname}%'
+ and user.mobile like '%${mobile}%'
+ and user.identity_no like '%${identityNo}%'
AND (find_in_set(#{streetId},user.PARENT_DEPT_IDS)
@@ -1249,7 +1249,7 @@
epdc_user uu
where uu.DEL_FLAG = '0'
and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}
- and uu.real_name uu '%${realName}%'
+ and uu.real_name like '%${realName}%'
and uu.NICKNAME like '%${nickname}%'
and uu.mobile like '%${mobile}%'
and uu.identity_no like '%${identityNo}%'
From 0958699276d632f4ab3aed715920270dec79fb63 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 28 May 2020 11:55:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E5=85=9A?=
=?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86=20=E3=80=91-=E3=80=90=E5=BE=85?=
=?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98=20sql=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/05/27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/PartyMembersDao.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index 2de436e5b..f913d6f45 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -256,9 +256,9 @@
FROM
epdc_user uu
where uu.DEL_FLAG = '0'
- and uu.REAL_NAME = #{realName}
- and uu.MOBILE = #{mobile}
- and uu.IDENTITY_NO = #{identityNo}
+ and uu.REAL_NAME like '%${realName}%'
+ and uu.MOBILE like '%${mobile}%'
+ and uu.IDENTITY_NO like '%${identityNo}%'
and uu.REGIST_FLAG = #{registFlag}
and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') >= #{startTime}
#{endTime}