qxm-修改DIY和厨卫多经销商切换查询报错问题

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

@@ -555,48 +555,7 @@ public class AnalysisDiyCustomerComponent {
 //                        user.setRoleIds(roleIds);
 //                        sysUserService.updateUser(user);
 //                    }
-                    List<AssRelcustomerinfo>  assRelcustomerinfoList=new ArrayList<>();
-                    if(!customerCode.equals(user.getSysUserExt().getCustomerCode())){
-                         assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode,user.getUserId().toString());
-                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
-                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(),customerCode);
-                        }
-                        assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode,user.getUserId().toString());
-                        if(assRelcustomerinfoList==null || assRelcustomerinfoList.size()==0){
-                            AssRelcustomerinfo info=new AssRelcustomerinfo();
-                            info.setUserId(user.getUserId().toString());
-                            if(isManager == 0){
-                            info.setMainkunnr(user.getSysUserExt().getOrgCode());
-                            }else{
-                                info.setMainkunnr(user.getSysUserExt().getCustomerCode());
-                            }
-                            info.setMainname1(user.getSysUserExt().getOrgName());
-                            info.setKunnr(customerCode);
-                            if(customerName !=null && customerName !=""){
-                                info.setName1(customerName);
-                            }else{
-                                if(isManager == 0){
-                                    String orgCode = jo.getString("depCode");
-                                    String code=null;
-                                    if(cusMap.containsKey(orgCode)){
-                                        Customers c = cusMap.get(orgCode);
-                                        code=c.getChainsCode();
-                                    }else{
-                                     code=orgCode;
-                                    }
-                                    String Name=assRelcustomerinfoService.selectCustomerName(code);
-                                    info.setName1(Name);
-                                }else{
-                                String Name=assRelcustomerinfoService.selectCustomerName(customerCode);
-                                info.setName1(Name);
-                                }
-                            }
-                            info.setGlfs("用户关联");
-                            assRelcustomerinfoService.insertAssRelcustomerinfo(info);
-
-                        }
 
-                    }
                     sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
 
                     if (!user.getSysUserExt().getIsCustomerManager().contains(isManager + "") ||
@@ -623,6 +582,58 @@ public class AnalysisDiyCustomerComponent {
                         user.setUserName(name);
                         sysUserService.updateUserInfo(user);
                     }
+
+                    List<AssRelcustomerinfo>  assRelcustomerinfoList=new ArrayList<>();
+                    /*过滤导购*/
+                    if (isManager!=0  && !user.getSysUserExt().getOrgCode().substring(0,3).equals("019") && !user.getSysUserExt().getCustomerCode().substring(0,3).equals("019") ) {
+                        if (user.getSysUserExt().getCustomerCode() != null && !customerCode.equals(user.getSysUserExt().getCustomerCode())) {
+                            assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
+                            if (assRelcustomerinfoList != null && assRelcustomerinfoList.size() > 0) {
+                                assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(), customerCode);
+                            }
+                            assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
+                            if (assRelcustomerinfoList == null || assRelcustomerinfoList.size() == 0) {
+                                AssRelcustomerinfo info = new AssRelcustomerinfo();
+                                info.setUserId(user.getUserId().toString());
+                                if (isManager == 0) {
+                                    info.setMainkunnr(user.getSysUserExt().getOrgCode());
+                                } else {
+                                    info.setMainkunnr(user.getSysUserExt().getCustomerCode());
+                                }
+
+                                if (cusMap.containsKey(info.getMainkunnr())) {
+                                    Customers c = cusMap.get(info.getMainkunnr());
+                                    info.setMainname1(c.getChainsName());
+                                }
+
+//                            info.setMainname1(user.getSysUserExt().getOrgName());
+                                info.setKunnr(customerCode);
+                                if (customerName != null && customerName != "") {
+                                    info.setName1(customerName);
+                                } else {
+                                    if (isManager == 0) {
+                                        String orgCode = jo.getString("depCode");
+                                        String code = null;
+                                        if (cusMap.containsKey(orgCode)) {
+                                            Customers c = cusMap.get(orgCode);
+                                            code = c.getChainsCode();
+                                        } else {
+                                            code = orgCode;
+                                        }
+                                        String Name = assRelcustomerinfoService.selectCustomerName(code);
+                                        info.setName1(Name);
+                                    } else {
+                                        String Name = assRelcustomerinfoService.selectCustomerName(customerCode);
+                                        info.setName1(Name);
+                                    }
+                                }
+                                info.setGlfs("用户关联");
+                                assRelcustomerinfoService.insertAssRelcustomerinfo(info);
+
+                            }
+
+                        }
+                    }
                 }
             }catch (Exception e){
                 log.error(e.getMessage());
@@ -748,27 +759,34 @@ public class AnalysisDiyCustomerComponent {
                     （首先查询当前用户职位，判断当前职位是否包含当前职位，不存在就更新，存在就不更新）*/
                     SysUser user = sysUserService.selectUserByLoginName(userid);
                     List<AssRelcustomerinfo>  assRelcustomerinfoList=new ArrayList<>();
-                    if(!customerCode.equals(user.getSysUserExt().getCustomerCode())){
-                          assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode,user.getUserId().toString());
-                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
-                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(),customerCode);
-                        }
-                        assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode,user.getUserId().toString());
-                        if(assRelcustomerinfoList==null || assRelcustomerinfoList.size()==0){
-                            String customerName=assRelcustomerinfoService.selectCustomerName(customerCode);
-                            AssRelcustomerinfo info=new AssRelcustomerinfo();
-                            info.setUserId(user.getUserId().toString());
-                            info.setMainkunnr(user.getSysUserExt().getCustomerCode());
-                            info.setMainname1(user.getSysUserExt().getOrgName());
-                            info.setKunnr(customerCode);
-                            if(customerName !=null && customerName!=""){
-                                info.setName1(customerName);
+                    if ( !user.getSysUserExt().getOrgCode().substring(0,3).equals("019") && !user.getSysUserExt().getCustomerCode().substring(0,3).equals("019")) {
+                        if (!customerCode.equals(user.getSysUserExt().getCustomerCode())) {
+                            assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
+                            if (assRelcustomerinfoList != null && assRelcustomerinfoList.size() > 0) {
+                                assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(), customerCode);
                             }
-                            info.setGlfs("用户关联");
-                            assRelcustomerinfoService.insertAssRelcustomerinfo(info);
+                            assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
+                            if (assRelcustomerinfoList == null || assRelcustomerinfoList.size() == 0) {
+                                String customerName = assRelcustomerinfoService.selectCustomerName(customerCode);
+                                AssRelcustomerinfo info = new AssRelcustomerinfo();
+                                info.setUserId(user.getUserId().toString());
+                                info.setMainkunnr(user.getSysUserExt().getCustomerCode());
+                                info.setMainname1(user.getSysUserExt().getOrgName());
+                                info.setKunnr(customerCode);
+                                if (customerName != null && customerName != "") {
+                                    info.setName1(customerName);
+                                }else {
+                                    if (cusMap.containsKey(info.getKunnr())) {
+                                        Customers c = cusMap.get(info.getKunnr());
+                                        info.setName1(c.getChainsName());
+                                    }
+                                }
+                                info.setGlfs("用户关联");
+                                assRelcustomerinfoService.insertAssRelcustomerinfo(info);
 
-                        }
+                            }
 
+                        }
                     }
                     if (diyNameSet.contains(userid)) {
                         sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
@@ -933,48 +951,6 @@ public class AnalysisDiyCustomerComponent {
 //                        user.setRoleIds(roleIds);
 //                        sysUserService.updateUser(user);
 //                    }
-                    List<AssRelcustomerinfo>  assRelcustomerinfoList=new ArrayList<>();
-                    if(!customerCode.equals(user.getSysUserExt().getCustomerCode())){
-                         assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode,user.getUserId().toString());
-                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
-                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(),customerCode);
-                        }
-                        assRelcustomerinfoList= assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode,user.getUserId().toString());
-                        if(assRelcustomerinfoList==null && assRelcustomerinfoList.size()==0){
-                            AssRelcustomerinfo info=new AssRelcustomerinfo();
-                            info.setUserId(user.getUserId().toString());
-                            if(isManager == 0){
-                                info.setMainkunnr(user.getSysUserExt().getOrgCode());
-                            }else{
-                                info.setMainkunnr(user.getSysUserExt().getCustomerCode());
-                            }
-                            info.setMainname1(user.getSysUserExt().getOrgName());
-                            info.setKunnr(customerCode);
-                            if(customerName !=null && customerName !=""){
-                                info.setName1(customerName);
-                            }else{
-                                if(isManager == 0){
-                                    String orgCode = jo.getString("depCode");
-                                    String code=null;
-                                    if(cusMap.containsKey(orgCode)){
-                                        Customers c = cusMap.get(orgCode);
-                                        code=c.getChainsCode();
-                                    }else{
-                                        code=orgCode;
-                                    }
-                                    String Name=assRelcustomerinfoService.selectCustomerName(code);
-                                    info.setName1(Name);
-                                }else{
-                                    String Name=assRelcustomerinfoService.selectCustomerName(customerCode);
-                                    info.setName1(Name);
-                                }
-                            }
-                            info.setGlfs("用户关联");
-                            assRelcustomerinfoService.insertAssRelcustomerinfo(info);
-
-                        }
-
-                    }
 
                     sysUserService.insertUserRole(user.getUserId(), roleIds[0]);