去除脏数据

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

@@ -869,43 +869,42 @@ public class AnalysisDiyCustomerComponent {
                 SysUser u = sysUserService.selectUserByLoginName(login);
                 if (("0").equals(u.getIsSync())) {
                     String CustomerManager = u.getSysUserExt().getIsCustomerManager();
-                    log.info("开始同步用户{}", login);
-                    log.info("取值的CustomerManager{}", CustomerManager);
-                    String[] manager = CustomerManager.split(",");
-                    if (manager.length > 1) {
-                        if(assVOList !=null && assVOList.size()>0){
-                            boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
-                            if(containsValue){
-                                for (UserAssVO vo:assVOList
-                                     ) {
-                                    if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber()) ){
-                                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
-                                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
-                                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
+                    if (StringUtils.isNotEmpty(CustomerManager)){
+                        String[] manager = CustomerManager.split(",");
+                        if (manager.length > 1) {
+                            if(assVOList !=null && assVOList.size()>0){
+                                boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
+                                if(containsValue){
+                                    for (UserAssVO vo:assVOList
+                                    ) {
+                                        if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber()) ){
+                                            List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
+                                            if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                                                assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
+                                            }
                                         }
                                     }
                                 }
-                            }
 
-                        }
-                        List<String> resultList = new ArrayList<>(manager.length);
-                        Collections.addAll(resultList,manager);
-                        Object i=isManager;
-                        resultList.remove(i.toString());
-                        String IsManager = resultList.stream().map(String::valueOf).collect(Collectors.joining(","));
-                        u.getSysUserExt().setIsCustomerManager(IsManager);
-                        sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
-                    } else {
-                        if(assVOList !=null && assVOList.size()>0){
-                            boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
-                            if(containsValue){
-                                for (UserAssVO vo:assVOList
-                                ) {
-                                    if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber())){
-                                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
-                                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
-                                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
-                                        }else{
+                            }
+                            List<String> resultList = new ArrayList<>(manager.length);
+                            Collections.addAll(resultList,manager);
+                            Object i=isManager;
+                            resultList.remove(i.toString());
+                            String IsManager = resultList.stream().map(String::valueOf).collect(Collectors.joining(","));
+                            u.getSysUserExt().setIsCustomerManager(IsManager);
+                            sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
+                        } else {
+                            if(assVOList !=null && assVOList.size()>0){
+                                boolean containsValue = assVOList.iterator().hasNext() && assVOList.iterator().next().getUserName().equals(u.getUserName());
+                                if(containsValue){
+                                    for (UserAssVO vo:assVOList
+                                    ) {
+                                        if(vo.getUserName().equals(u.getUserName()) && vo.getPhone().equals(u.getPhonenumber())){
+                                            List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(vo.getCustomerCode(), String.valueOf(u.getUserId()));
+                                            if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                                                assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), vo.getCustomerCode());
+                                            }else{
                                                 //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
                                                 if(("1").equals(u.getIsShopAccount())){
                                                     SysUserExt userExt = u.getSysUserExt();
@@ -919,8 +918,23 @@ public class AnalysisDiyCustomerComponent {
                                                     u.setQuit("2");
                                                     sysUserService.updateUserInfo(u);
                                                 }
+                                            }
                                         }
                                     }
+                                }else{
+                                    //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
+                                    if(("1").equals(u.getIsShopAccount())){
+                                        SysUserExt userExt = u.getSysUserExt();
+                                        if(userExt !=null){
+                                            userExt.setDelFlag("2");
+                                            userExt.setDelTime(new Date());
+                                            sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
+                                        }
+
+                                    }else{
+                                        u.setQuit("2");
+                                        sysUserService.updateUserInfo(u);
+                                    }
                                 }
                             }else{
                                 //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
@@ -937,20 +951,6 @@ public class AnalysisDiyCustomerComponent {
                                     sysUserService.updateUserInfo(u);
                                 }
                             }
-                        }else{
-                            //检测用户是否还有门店账号标识，有则把用户扩展信息离职掉，没有则主账号离职+扩展信息离职
-                            if(("1").equals(u.getIsShopAccount())){
-                                SysUserExt userExt = u.getSysUserExt();
-                                if(userExt !=null){
-                                    userExt.setDelFlag("2");
-                                    userExt.setDelTime(new Date());
-                                    sysUserExtMapper.updateSysUserExt(u.getSysUserExt());
-                                }
-
-                            }else{
-                                u.setQuit("2");
-                                sysUserService.updateUserInfo(u);
-                            }
                         }
                     }
                 }