部门表中，添加一列销售维护部门名称（兼容勤策）

src/main/java/com/sfa/job/domain/system/dao/SysDeptDaoImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -76,7 +77,18 @@ public class SysDeptDaoImpl implements ISysDeptDao{
 
         Boolean statusB = jo.getJSONObject("status").getBoolean("is_deleted");
         sysDept.setStatus(statusB?"1":"0");
-        sysDeptMapper.insertOrUpdate(sysDept);
+
+        // 查询code是否存在，不存在则新增，保存则修改，ON DUPLICATE KEY 关键字会造成ID大量新增，弃用
+        SysDept sysDeptOld = sysDeptMapper.selectOneByDeptCode(sysDept.getDeptCode());
+        if (Objects.isNull(sysDeptOld)){
+            sysDept.setDeptNameSale(sysDept.getDeptName());
+            sysDeptMapper.insert(sysDept);
+            return sysDept;
+        }else if ("0".equals(sysDeptOld.getDeptNameSaleIsFs())){
+            sysDept.setDeptNameSale(sysDept.getDeptName());
+        }
+        sysDept.setDeptId(sysDeptOld.getDeptId());
+        sysDeptMapper.updateById(sysDept);
         return sysDept;
     }
 

src/main/java/com/sfa/job/domain/system/dao/SysUserDaoImpl.java

 package com.sfa.job.domain.system.dao;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sfa.common.core.enums.StatusType;
 import com.sfa.job.domain.system.entity.SysUser;
 import com.sfa.job.domain.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -48,7 +46,15 @@ public class SysUserDaoImpl implements ISysUserDao{
         sysUser.setWorkCityName(jo.getString("city"));
         sysUser.setStatus(StatusType.INVALID.getType()+"");
 
-        sysUserMapper.insertOrUpdate(sysUser);
+        // 根据username（工号）查询
+        SysUser sysUserOld = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, sysUser.getUserName()));
+        if (Objects.nonNull(sysUserOld)){
+            sysUser.setUserId(sysUserOld.getUserId());
+            sysUserMapper.putById(sysUser);
+            return;
+        }
+
+        sysUserMapper.insert(sysUser);
     }
 
     @Override

src/main/java/com/sfa/job/domain/system/entity/SysDept.java

@@ -30,6 +30,14 @@ public class SysDept implements Serializable {
      * 部门名称
      */
     private String deptName;
+    /**
+     * 销售部门名称
+     */
+    private String deptNameSale;
+    /**
+     * 销售部门名称是否同步飞书名称；0:同步；1:不同步
+     */
+    private String deptNameSaleIsFs;
 
     /**
      * 飞书部门IDopen_department_id

src/main/java/com/sfa/job/domain/system/mapper/SysDeptMapper.java

@@ -25,6 +25,7 @@ public interface SysDeptMapper extends BaseMapper<SysDept> {
 
     List<HashMap<String, String>> getDeptCodeAndNameMap();
 
+    SysDept selectOneByDeptCode(String deptCode);
 }
 
 

src/main/java/com/sfa/job/domain/system/mapper/SysUserMapper.java

@@ -31,6 +31,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<String> selectResignedUsers();
 
+    void putById(SysUser sysUser);
 }
 
 

src/main/resources/mapper/master/SysDeptMapper.xml

@@ -4,10 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sfa.job.domain.system.mapper.SysDeptMapper">
 
-    <resultMap id="BaseResultMap" type="com.sfa.job.domain.system.entity.SysDept">
+    <resultMap id="SysDeptBase" type="com.sfa.job.domain.system.entity.SysDept">
         <id property="deptId" column="dept_id" jdbcType="BIGINT"/>
         <result property="deptCode" column="dept_code" jdbcType="VARCHAR"/>
         <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
+        <result property="deptNameSale" column="dept_name_sale" jdbcType="VARCHAR"/>
+        <result property="deptNameSaleIsFs" column="dept_name_sale_is_fs" jdbcType="VARCHAR"/>
         <result property="fsDeptId" column="fs_dept_id" jdbcType="VARCHAR"/>
         <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
         <result property="parentCode" column="parent_code" jdbcType="VARCHAR"/>
@@ -90,4 +92,8 @@
     <select id="getDeptCodeAndNameMap" resultType="java.util.HashMap">
         select dept_code,dept_name from sys_dept where del_flag = '0';
     </select>
+
+    <select id="selectOneByDeptCode" resultMap="SysDeptBase">
+        select * from sys_dept where dept_code = #{deptCode}
+    </select>
 </mapper>

src/main/resources/mapper/master/SysUserMapper.xml

@@ -110,4 +110,16 @@
         select user_name from sys_user where del_flag = '0' and offboard_date <= current_date();
     </select>
 
+    <update id="putById" parameterType="com.sfa.job.domain.system.entity.SysUser">
+        update sys_user set
+            dept_id        = #{deptId},
+            nick_name      = #{nickName},
+            email          = #{email},
+            phonenumber    = #{phonenumber},
+            work_city_name = #{workCityName},
+            update_by      = #{updateBy},
+            fs_open_id     = #{fsOpenId},
+            update_user_id = #{updateUserId}
+        where user_id = #{userId}
+    </update>
 </mapper>