From 3c0e86430bcf77fa7285a5c589877eddf775ecbf Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 16 Mar 2022 14:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E4=B8=AD=E4=BB=8B=E5=BA=93?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=8F=98=E5=8A=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ExDeptDao.xml      | 10 +++++-----
 .../src/main/resources/mapper/ExUserDao.xml      | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
index 0d7af2fa2b..0de6a47003 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExDeptDao.xml
@@ -10,7 +10,7 @@
             <trim prefix="qx_dept_id =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.qxDeptId'>
-                        when qx_dept_name = #{item.qxDeptName} then #{item.qxDeptId}
+                        when dept_name = #{item.qxDeptName} then #{item.qxDeptId}
                     </if>
                 </foreach>
             </trim>
@@ -18,7 +18,7 @@
             <trim prefix="qx_dept_name =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.qxDeptName'>
-                        when qx_dept_name = #{item.qxDeptName} then #{item.qxDeptId}
+                        when dept_name = #{item.qxDeptName} then #{item.qxDeptName}
                     </if>
                 </foreach>
             </trim>
@@ -26,7 +26,7 @@
             <trim prefix="qx_dept_code =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.qxDeptCode'>
-                        when qx_dept_name = #{item.qxDeptName} then #{item.qxDeptCode}
+                        when dept_name = #{item.qxDeptName} then #{item.qxDeptCode}
                     </if>
                 </foreach>
             </trim>
@@ -34,7 +34,7 @@
             <trim prefix="qx_customer_id =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.qxCustomerId'>
-                        when qx_dept_name = #{item.qxDeptName} then #{item.qxCustomerId}
+                        when dept_name = #{item.qxDeptName} then #{item.qxCustomerId}
                     </if>
                 </foreach>
             </trim>
@@ -43,7 +43,7 @@
         WHERE
         1=1
         <foreach collection="list" item="item" open="AND(  " separator=" OR " index="index" close=")">
-            qx_dept_name = #{item.qxDeptName}
+            dept_name = #{item.qxDeptName}
         </foreach>
     </update>
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml
index 3d904577fd..c56d93b581 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/ExUserDao.xml
@@ -7,10 +7,18 @@
         UPDATE ex_user
         <trim prefix="set" suffixOverrides=",">
 
+            <trim prefix="qx_user_id =(case" suffix="end),">
+                <foreach collection="list" item="item">
+                    <if test='null != item.qxUserId'>
+                        when (login_name = #{item.qxMobile} ) then #{item.qxUserId}
+                    </if>
+                </foreach>
+            </trim>
+
             <trim prefix="qx_user_name =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.qxUserName'>
-                        when (qx_user_id = #{item.qxUserId} ) then #{item.qxUserName}
+                        when (login_name = #{item.qxMobile} ) then #{item.qxUserName}
                     </if>
                 </foreach>
             </trim>
@@ -18,7 +26,7 @@
             <trim prefix="qx_mobile =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.qxMobile'>
-                        when (qx_user_id = #{item.qxUserId} ) then #{item.qxMobile}
+                        when (login_name = #{item.qxMobile} ) then #{item.qxMobile}
                     </if>
                 </foreach>
             </trim>
@@ -26,7 +34,7 @@
             <trim prefix="qx_customer_id =(case" suffix="end),">
                 <foreach collection="list" item="item">
                     <if test='null != item.qxCustomerId'>
-                        when (qx_user_id = #{item.qxUserId} ) then #{item.qxCustomerId}
+                        when (login_name = #{item.qxMobile} ) then #{item.qxCustomerId}
                     </if>
                 </foreach>
             </trim>
@@ -34,7 +42,7 @@
         </trim>
         WHERE 1=1
         <foreach collection="list" item="item" open="AND (  " separator=" OR " index="index" close=")">
-            (qx_user_id = #{item.qxUserId} )
+            (login_name = #{item.qxMobile} )
         </foreach>
     </update>