|
|
@@ -217,11 +217,20 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
Admin my = adminMapper.selectByPrimaryKey(aid);
|
|
|
boolean flag= my.getPublicPurview() == 1;
|
|
|
+ List<Role> roles = adminMapper.selectRolesByPrimaryKey(aid);
|
|
|
+ boolean flag2=false;
|
|
|
+ for (Role role : roles) {
|
|
|
+ if (AFTConstants.SALESMAN.equals(role.getRoleType().toString())){
|
|
|
+ flag2=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (ids!=null&& !ids.isEmpty()){
|
|
|
String[] split = ids.split(",");
|
|
|
for (String s : split) {
|
|
|
UserRestrictProjectBo bo = new UserRestrictProjectBo();
|
|
|
bo.setUid(s);
|
|
|
+ bo.setAdminSalesman(flag2?1:0);
|
|
|
User user = userMapper.selectByPrimaryKey(s);
|
|
|
bo.setUserName(user.getNickname());
|
|
|
if (!flag){
|