|
@@ -375,6 +375,13 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
List<SysUserOrderAuthor> yslrole=sysUserOrderAuthorMapper.selectByParentId(yslauthList);
|
|
List<SysUserOrderAuthor> yslrole=sysUserOrderAuthorMapper.selectByParentId(yslauthList);
|
|
|
userOrderAuthorYSLList.addAll(yslrole);
|
|
userOrderAuthorYSLList.addAll(yslrole);
|
|
|
}
|
|
}
|
|
|
|
|
+ //xls
|
|
|
|
|
+ List<SysUserOrderAuthor> userOrderAuthorXlsList = sysUserOrderAuthorMapper.selectAuthorIdByCode("XLS",null);
|
|
|
|
|
+ if(userOrderAuthorXlsList !=null && userOrderAuthorXlsList.size()>0){
|
|
|
|
|
+ List<Long> xlsAuthList=userOrderAuthorXlsList.stream().map(SysUserOrderAuthor::getAuthorId).collect(Collectors.toList());
|
|
|
|
|
+ List<SysUserOrderAuthor> xlsRole=sysUserOrderAuthorMapper.selectByParentId(xlsAuthList);
|
|
|
|
|
+ userOrderAuthorXlsList.addAll(xlsRole);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
userExtMapper.selectUserExtList().forEach(sysUserExt -> {
|
|
userExtMapper.selectUserExtList().forEach(sysUserExt -> {
|
|
|
String sales = sysUserExt.getSalesLevel();
|
|
String sales = sysUserExt.getSalesLevel();
|
|
@@ -385,7 +392,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
userOrderAuthorList.clear();
|
|
userOrderAuthorList.clear();
|
|
|
userOrderAuthorList.addAll(userOrderAuthorCwList);
|
|
userOrderAuthorList.addAll(userOrderAuthorCwList);
|
|
|
} else*/ if (intNumber.equals("diy")||intNumber.equals("company") || intNumber.equals("office") || intNumber.equals("emp")
|
|
} else*/ if (intNumber.equals("diy")||intNumber.equals("company") || intNumber.equals("office") || intNumber.equals("emp")
|
|
|
- || intNumber.equals("saledept") || intNumber.equals("suboffice")|| intNumber.equals("customer")) {
|
|
|
|
|
|
|
+ || intNumber.equals("saledept") || intNumber.equals("suboffice")) {
|
|
|
userOrderAuthorList.clear();
|
|
userOrderAuthorList.clear();
|
|
|
roleAuth.clear();
|
|
roleAuth.clear();
|
|
|
userOrderAuthorList.addAll(userOrderAuthorDiyList);
|
|
userOrderAuthorList.addAll(userOrderAuthorDiyList);
|
|
@@ -408,6 +415,25 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
userOrderAuthorList.addAll(userOrderAuthor36List);
|
|
userOrderAuthorList.addAll(userOrderAuthor36List);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ }else if(intNumber.equals("customer")){
|
|
|
|
|
+ String isCustomerManager=sysUserExt.getIsCustomerManager();
|
|
|
|
|
+ if(isCustomerManager !=null && !("").equals(isCustomerManager)){
|
|
|
|
|
+ List<String> isManager =Arrays.asList(isCustomerManager.split(","));
|
|
|
|
|
+ //7新零售经销商
|
|
|
|
|
+ if(isManager.contains("7")){
|
|
|
|
|
+ userOrderAuthorList.clear();
|
|
|
|
|
+ roleAuth.clear();
|
|
|
|
|
+ userOrderAuthorList.addAll(userOrderAuthorXlsList);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ userOrderAuthorList.clear();
|
|
|
|
|
+ roleAuth.clear();
|
|
|
|
|
+ userOrderAuthorList.addAll(userOrderAuthorDiyList);
|
|
|
|
|
+ }
|
|
|
|
|
+ }else{
|
|
|
|
|
+ userOrderAuthorList.clear();
|
|
|
|
|
+ roleAuth.clear();
|
|
|
|
|
+ userOrderAuthorList.addAll(userOrderAuthorDiyList);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
if(userOrderAuthorList !=null && userOrderAuthorList.size()>0){
|
|
if(userOrderAuthorList !=null && userOrderAuthorList.size()>0){
|
|
|
userAuthorRelMapper.deleteSysUserAuthorRelById(sysUserExt.getUserId());
|
|
userAuthorRelMapper.deleteSysUserAuthorRelById(sysUserExt.getUserId());
|