删除role

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

@@ -347,10 +347,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     }
                     /** =============用户基本信息构建 end===============*/
 
-                    SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
-                    if("1".equals(sysUser.getIsSync())){
-                        continue;
-                    }
+
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
                     userExt.setBossEmployeeId(m.getBossEmployeeId());
@@ -452,6 +449,10 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
+                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                        if("1".equals(sysUser.getIsSync())){
+                            continue;
+                        }
                         if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
                             sysUserService.deleteByLoginName(user.getLoginName());
                         }
@@ -463,8 +464,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                             user.setUserId(sysUser.getUserId());
                             insertUserRole(user);
                         }
-                        SysUser userInDb =sysUserService.selectUserByLoginName(user.getLoginName());
-                        if(!userInDb.getSysUserExt().getSalesLevel().equals("diy_level")){
+
+                        if(!sysUser.getSysUserExt().getSalesLevel().equals("diy_level")){
                             user.setSysUserExt(userExt);
                         }
                         user.setUpdateTime(new Date());
@@ -600,10 +601,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         user.setStatus("0");
                     }
                     /** =============用户基本信息构建 end===============*/
-                    SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
-                    if("1".equals(sysUser.getIsSync())){
-                        continue;
-                    }
+
 
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
@@ -676,6 +674,10 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
+                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                        if("1".equals(sysUser.getIsSync())){
+                            continue;
+                        }
                         if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
                             sysUserService.deleteByLoginName(user.getLoginName());
                         }
@@ -687,8 +689,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                             user.setUserId(sysUser.getUserId());
                             insertUserRole(user);
                         }
-                        SysUser userInDb = sysUserService.selectUserByLoginName(user.getLoginName());
-                        if (!userInDb.getSysUserExt().getSalesLevel().equals("diy_level")) {
+
+                        if (!sysUser.getSysUserExt().getSalesLevel().equals("diy_level")) {
                             user.setSysUserExt(userExt);
                         }
                         user.setUpdateTime(new Date());
@@ -814,10 +816,6 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                         user.setStatus("0");
                     }
                     /** =============用户基本信息构建 end===============*/
-                    SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
-                    if(sysUser.getIsSync().equals("1")){
-                        continue;
-                    }
 
                     /**======== 构建diy用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
@@ -876,6 +874,10 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
+                        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+                        if(sysUser.getIsSync().equals("1")){
+                            continue;
+                        }
                        if(!sysUser.getSysUserExt().getSalesLevel().equals(userExt.getSalesLevel())){
                            sysUserService.deleteByLoginName(user.getLoginName());
                        }
@@ -996,9 +998,6 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     }
                     /** =============用户基本信息构建 end===============*/
                     SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
-                    if(sysUser.getIsSync().equals("1")){
-                        continue;
-                    }
 
                     /**======== 构建用户扩展信息表 start===============*/
                     SysUserExt userExt = new SysUserExt();
@@ -1015,6 +1014,9 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
                     if (loginNameList.contains(user.getLoginName().toUpperCase())) {
                         /**  更新 */
+                        if(sysUser.getIsSync().equals("1")){
+                            continue;
+                        }
                         sysUserService.deleteByLoginName(user.getLoginName());
                         SysUserRole role=new SysUserRole();
                         role.setUserId(sysUser.getUserId());
@@ -1111,11 +1113,13 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         userExt.setOrgName("品保中心");
         userExt.setOrgCode("1");
         /**======== 构建用户扩展信息表 end===============*/
-        SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
-        if(!("1").equals(sysUser.getIsSync())){
+
+
         loginNameList = loginNameList.stream().map(String::toUpperCase).collect(Collectors.toSet());
         if (loginNameList.contains(user.getLoginName().toUpperCase())) {
             /**  更新 */
+            SysUser sysUser=sysUserService.selectUserByLoginName(user.getLoginName());
+            if(!("1").equals(sysUser.getIsSync())){
             sysUserService.deleteByLoginName(user.getLoginName());
             SysUserRole role=new SysUserRole();
             role.setUserId(sysUser.getUserId());
@@ -1125,6 +1129,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
             user.setSysUserExt(userExt);
             user.setUpdateTime(new Date());
             sysUserService.updateUserInfoAndSalesExt(user);
+            }
         } else {
             /**  插入 */
             userExt.setIdentity(UserIdentityUtil.UI_ClueReporting);
@@ -1135,7 +1140,6 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
             user.setSysUserExt(userExt);
             sysUserService.insertUserAndSalesExt(user);
         }
-        }
     }