|
@@ -1,20 +1,24 @@
|
|
|
package org.jeecg.modules.ctop.service.impl;
|
|
|
|
|
|
-import cn.com.ctop.common.module.entity.Project;
|
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
|
import cn.com.ctop.common.module.mapper.UserAllocationMapper;
|
|
|
import cn.com.ctop.common.module.service.ISysRoleService;
|
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
|
+import cn.com.ctop.common.module.utils.SpringUtils;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import org.apache.commons.lang.ArrayUtils;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
+import org.jeecg.modules.ctop.entity.Project;
|
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
|
import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
|
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
|
import org.jeecg.modules.system.entity.SysUser;
|
|
|
+import org.openqa.selenium.By;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
@@ -39,6 +43,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
@Autowired
|
|
|
private UserAllocationMapper userAllocationMapper;
|
|
|
|
|
|
+ private static final String[] PERMISSION_VIEW_PROJECT={"admin","saleDirector","sale","saleAssistant","saleAm"};
|
|
|
@Override
|
|
|
public void addMember(SysUser sysUser, Project project) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
@@ -70,7 +75,6 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
}
|
|
|
|
|
|
//视频报表
|
|
|
- @Override
|
|
|
public List<ProjectMember> getProjects(List<Integer> mediaIds) {
|
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
String userId = sysUser.getId();
|
|
@@ -86,15 +90,9 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
} else if (roleCode.equals("admin")) {
|
|
|
projectMemberList = memberMapper.adminProjects(mediaIds);
|
|
|
} else if (roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")) {
|
|
|
- projectMemberList = memberMapper.designProjects(userId, mediaIds);
|
|
|
- }else{
|
|
|
- //如果以上角色都不是的话直接查询此角色所属项目
|
|
|
- projectMemberList = memberMapper.designProjects(userId, mediaIds);
|
|
|
+ projectMemberList = memberMapper.operationProjects(userId, mediaIds);
|
|
|
}
|
|
|
|
|
|
- if(null == projectMemberList){
|
|
|
- projectMemberList = new ArrayList<>();
|
|
|
- }
|
|
|
return projectMemberList;
|
|
|
}
|
|
|
|
|
@@ -136,7 +134,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
|
|
|
private List<ProjectMember> queryProjectMemberBy(String userId, List<Integer> mediaIds) {
|
|
|
String roleCode = memberMapper.getRoleCodeByUserId(userId);
|
|
|
- if(roleCode.equals("admin")){
|
|
|
+ if(ArrayUtils.contains(PERMISSION_VIEW_PROJECT,roleCode)){
|
|
|
return memberMapper.adminProjects(mediaIds);
|
|
|
}
|
|
|
return memberMapper.queryProjectMemberByUserId(userId,mediaIds);
|