解决缺陷

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterOutInHistoryUserServiceImpl.java

@@ -195,9 +195,11 @@ public class CoreIntroduceLetterOutInHistoryUserServiceImpl extends ServiceImpl<
 
         LambdaQueryWrapper<CoreIntroduceLetterOutInHistoryUser> lqw = new LambdaQueryWrapper<>();
         lqw.eq(CoreIntroduceLetterOutInHistoryUser::getOrgId, orgId)
-                .in(CoreIntroduceLetterOutInHistoryUser::getUserName, userNameList)
-                .or()
-                .in(CoreIntroduceLetterOutInHistoryUser::getIdCard, idCardList);
+                .and (wrapper -> wrapper
+                        .in(CoreIntroduceLetterOutInHistoryUser::getUserName, userNameList)
+                        .or()
+                        .in(CoreIntroduceLetterOutInHistoryUser::getIdCard, idCardList)
+                );
         List<CoreIntroduceLetterOutInHistoryUser> historyUsers = coreIntroduceLetterOutInHistoryUserMapper.selectList(lqw);
 
         List<CoreIntroduceLetterOutInHistoryUser> users = new ArrayList<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -1023,6 +1023,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
                              updateLetterUserList.add(first.get());
                          }
                     });
+                    log.info("同步人员信息到介绍信 {}",updateLetterUserList);
                     coreIntroduceLetterMapper.batchUpdateLetterUserList(updateLetterUserList);
                 }
                 //回写历史人员库

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -417,7 +417,7 @@
         <if test="coreIntroduceLetter.keyWords !=null and coreIntroduceLetter.keyWords !=''">
             and u.user_name like concat('%', #{coreIntroduceLetter.keyWords}, '%')
         </if>
-        order by a.status ASC, a.create_time DESC
+        order by a.create_time DESC
     </select>
 
     <select id="findLetterApproveInfos"