|
|
@@ -95,8 +95,11 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
Long roleId = Long.parseLong(configService.selectConfigByKey("libang.user.roleid"));
|
|
|
//推荐下单角色仅限销售部和销售员
|
|
|
Long recommendRoleId = Long.parseLong(configService.selectConfigByKey("libang.user.recommend.roleid"));
|
|
|
+ //自提角色
|
|
|
+ Long selfRoleId = Long.parseLong(configService.selectConfigByKey("libang.user.self.roleid"));
|
|
|
Long[] roleIds = {roleId};
|
|
|
- Long[] recommendRoleIds = {roleId,recommendRoleId};
|
|
|
+ //Long[] recommendRoleIds = {roleId,recommendRoleId};推荐下单
|
|
|
+ Long[] selfRoleIdAndRecommendRoleIds = {recommendRoleId,selfRoleId,roleId};
|
|
|
if(metaEmployeeDiys.size()>0){
|
|
|
|
|
|
//用户objid3为列表内的内容才为DIY人员
|
|
|
@@ -195,11 +198,11 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
if(empSet.contains(m.getEmployeePostName())){
|
|
|
//等级6 销售员
|
|
|
userExt.setSalesLevel("emp_level");
|
|
|
- user.setRoleIds(recommendRoleIds);
|
|
|
+ user.setRoleIds(selfRoleIdAndRecommendRoleIds);
|
|
|
}else if(subofficeSet.contains(m.getEmployeePostName())){
|
|
|
//等级6 销售分部
|
|
|
userExt.setSalesLevel("suboffice_level");
|
|
|
- user.setRoleIds(recommendRoleIds);
|
|
|
+ user.setRoleIds(selfRoleIdAndRecommendRoleIds);
|
|
|
}
|
|
|
break;
|
|
|
case 4:
|
