ct hace 1 mes
padre
commit
9ca83ff00c

+ 4 - 1
fs-qw-api/src/main/java/com/fs/app/service/impl/OpenQwApiServiceImpl.java

@@ -262,6 +262,7 @@ public class OpenQwApiServiceImpl implements OpenQwApiService {
         qwUser.setIsDel(0);
         qwUser.setOpenid(openid);
         qwUser.setQwOpenUserId(apiUser.getUserid());
+        qwUser.setQwUserId(apiUser.getUserid());
 
         // 设置部门(取第一个部门)
         List<Integer> depts = apiUser.getDepartment();
@@ -290,7 +291,9 @@ public class OpenQwApiServiceImpl implements OpenQwApiService {
 
         int insertSuccess = 0, updateSuccess = 0;
         if (!toInsert.isEmpty()) {
-            insertSuccess = qwUserMapper.batchUpdateQwUser(toInsert);
+            // 新增必须走 batchInsertQwUser(INSERT 不含 id),否则 batchUpdateQwUser 会写入显式 id,
+            // MyBatis-Plus 易对空主键填充雪花 id,导致与期望的自增主键不一致。
+            insertSuccess = qwUserMapper.batchInsertQwUser(toInsert);
         }
         if (!toUpdate.isEmpty()) {
             updateSuccess = qwUserMapper.batchUpdateQwUser(toUpdate);

+ 4 - 1
fs-service/src/main/java/com/fs/qw/domain/QwUser.java

@@ -1,7 +1,9 @@
 package com.fs.qw.domain;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -17,7 +19,8 @@ public class QwUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** id */
+    /** id(数据库自增;勿依赖应用侧雪花填充) */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** 企微用户id */

+ 1 - 1
fs-service/src/main/resources/mapper/qw/QwUserMapper.xml

@@ -343,7 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
-    <!-- 批量插入 - 补充完整字段 -->
+    <!-- 批量插入 - 不含主键 id,走数据库 AUTO_INCREMENT(勿与 batchUpdateQwUser 混用) -->
     <insert id="batchInsertQwUser">
         INSERT INTO qw_user (
         department, qw_user_name, corp_id, openid, qw_open_user_id,