人员解析大小写导致重复问题

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

@@ -25,10 +25,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Component
 public class AnalysisDiyCustomerComponent {
@@ -375,7 +375,8 @@ public class AnalysisDiyCustomerComponent {
                 if(userid==null||userid.trim().equals("")){
                     continue;
                 }
-                if (!loginNameSet.contains(userid)) {
+                loginNameSet = loginNameSet.stream().map(String::toUpperCase).collect(Collectors.toSet());
+                if (!loginNameSet.contains(userid.toUpperCase())) {
 
                     /** =============用户基本信息构建 start===============*/
                     SysUser user = new SysUser();

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

@@ -27,6 +27,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service("analysisDiyCustomerService")
 public class AnalysisSysUserService implements IAnalysisSysUserService {
@@ -190,7 +191,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 //                    }
 
                     /**======== 构建diy用户扩展信息表 end===============*/
-                    if (loginNameList.contains(user.getLoginName())) {
+                    loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
+                    if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
                         SysUser userInDb =sysUserService.selectUserByLoginName(user.getLoginName());
                         if(!userInDb.getSysUserExt().getSalesLevel().equals("diy_level")){
@@ -412,7 +414,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
 //                    }
 
                     /**======== 构建diy用户扩展信息表 end===============*/
-                    if (loginNameList.contains(user.getLoginName())) {
+                    loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
+                    if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
                         SysUser userInDb =sysUserService.selectUserByLoginName(user.getLoginName());
                         if(!userInDb.getSysUserExt().getSalesLevel().equals("diy_level")){
@@ -592,7 +595,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     }
 
                     /**======== 构建diy用户扩展信息表 end===============*/
-                    if (loginNameList.contains(user.getLoginName())) {
+                    loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
+                    if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
                         SysUser userInDb = sysUserService.selectUserByLoginName(user.getLoginName());
                         if (!userInDb.getSysUserExt().getSalesLevel().equals("diy_level")) {
@@ -771,7 +775,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     }
 
                     /**======== 构建diy用户扩展信息表 end===============*/
-                    if (loginNameList.contains(user.getLoginName())) {
+                    loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
+                    if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
                         user.setSysUserExt(userExt);
                         user.setUpdateTime(new Date());