雅士利解析人员问题修复2

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -3,6 +3,7 @@ package com.dgtly.sync.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.exception.BusinessException;
 import com.dgtly.common.utils.ShiroSaltUtil;
+import com.dgtly.common.utils.StringUtils;
 import com.dgtly.common.utils.security.EncryptPassWordClass;
 import com.dgtly.sync.domain.MetaEmployeeDiy;
 import com.dgtly.sync.domain.SyncFailDetail;
@@ -756,13 +757,23 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         continue;
                     }
 
+                    if (StringUtils.isEmpty(userExt.getOrgCode())){
+                        log.error("YSL用户对应的销售部未找到！当前用户信息： " + m.getLoginName() + " ， 销售部名称： " + userExt.getOrgName());
+                        SyncFailDetail syncFailDetail = new SyncFailDetail();
+                        syncFailDetail.setPackageId(packageId);
+                        syncFailDetail.setFailReason("YSL用户对应的销售部未找到！当前用户信息： " + m.getLoginName() + " ， 销售部名称： " + userExt.getOrgName());
+                        syncFailDetail.setDataJson(JSONObject.toJSONString(m));
+                        syncFailDetail.setFailLevel("1");
+                        syncFailDetail.setExceptionType("not found dept");
+                        failDetails.add(syncFailDetail);
+                        failCount++;
+                        continue;
+                    }
+
                     /**======== 构建diy用户扩展信息表 end===============*/
                     if (loginNameList.contains(user.getLoginName())) {
                         /**  更新 */
-                        SysUser userInDb = sysUserService.selectUserByLoginName(user.getLoginName());
-                        if (!userInDb.getSysUserExt().getSalesLevel().equals("diy_level")) {
-                            user.setSysUserExt(userExt);
-                        }
+                        user.setSysUserExt(userExt);
                         user.setUpdateTime(new Date());
                         sysUserService.updateUserInfoAndSalesExt(user);
                     } else {

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserMapper.java

@@ -106,6 +106,14 @@ public interface SysUserMapper
      */
     public int updateUser(SysUser user);
 
+    /**
+     * 根据用户登录名修改用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserByLoginName(SysUser user);
+
     //修改认证状态
     public int updateIsAuthentication(@Param("isAuthentication") String isAuthentication,@Param("accountId") String accountId);
 

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserServiceImpl.java

@@ -276,8 +276,7 @@ public class SysUserServiceImpl implements ISysUserService
             userExt.setUserId(u.getUserId());
             userExtMapper.insertOrUpSysUserExt(userExt);
         }
-
-        return userMapper.updateUser(user);
+        return userMapper.updateUserByLoginName(user);
     }
 
     /**

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -286,6 +286,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		where user_id = #{userId}
 	</update>
 
+	<update id="updateUserByLoginName" parameterType="SysUser">
+		update sys_user
+		<set>
+			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+			<if test="userName != null and userName != ''">user_name = #{userName},</if>
+			<if test="email != null and email != ''">email = #{email},</if>
+			<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber},</if>
+			<if test="sex != null and sex != ''">sex = #{sex},</if>
+			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
+			<if test="password != null and password != ''">password = #{password},</if>
+			<if test="salt != null and salt != ''">salt = #{salt},</if>
+			<if test="idType != null and idType != ''">id_type = #{idType},</if>
+			<if test="idNumber != null and idNumber != ''">id_number = #{idNumber},</if>
+			<if test="accountId != null and accountId != ''">account_id = #{accountId},</if>
+			<if test="isAuthentication != null and isAuthentication != ''">is_authentication = #{isAuthentication},</if>
+			<if test="personAttestationTime != null">person_attestation_time = #{personAttestationTime},</if>
+			<if test="receiveUrlMobileNo != null and receiveUrlMobileNo != ''">receive_url_mobile_no = #{receiveUrlMobileNo},</if>
+			<if test="status != null and status != ''">status = #{status},</if>
+			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
+			<if test="loginDate != null">login_date = #{loginDate},</if>
+			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+			<if test="remark != null">remark = #{remark},</if>
+			<if test="isConsignee != null">is_consignee = #{isConsignee},</if>
+			<if test="isSync != null">is_sync = #{isSync},</if>
+			update_time = sysdate()
+		</set>
+		where login_name = #{loginName}
+	</update>
+
 	<update id="updateIsAuthentication" parameterType="String">
 		update sys_user set is_authentication = #{isAuthentication} ,person_attestation_time = now()
 		where account_id = #{accountId}