多岗

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -436,11 +436,16 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
                     if(isCustomerManager !=null && !("").equals(isCustomerManager)){
                         List<String> isManager =Arrays.asList(isCustomerManager.split(","));
                         //7新零售经销商
-                        if(isManager.contains("7")){
+                        if(isManager.size()==1 && isManager.contains("7")){
                             userOrderAuthorList.clear();
                             roleAuth.clear();
                             userOrderAuthorList.addAll(userOrderAuthorXlsList);
-                        }else{
+                        }else if(isManager.contains("7") && isManager.size()>1 ){
+                            userOrderAuthorList.clear();
+                            roleAuth.clear();
+                            userOrderAuthorList.addAll(userOrderAuthorXlsList);
+                            userOrderAuthorList.addAll(userOrderAuthorDiyList);
+                        }else {
                             userOrderAuthorList.clear();
                             roleAuth.clear();
                             userOrderAuthorList.addAll(userOrderAuthorDiyList);