Merge branch 'dev'

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>
 

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>