|
@@ -1,11 +1,11 @@
|
|
package org.jeecg.modules.ctop.service.impl;
|
|
package org.jeecg.modules.ctop.service.impl;
|
|
|
|
|
|
|
|
+import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.mapper.UserAllocationMapper;
|
|
import cn.com.ctop.common.module.mapper.UserAllocationMapper;
|
|
import cn.com.ctop.common.module.service.ISysRoleService;
|
|
import cn.com.ctop.common.module.service.ISysRoleService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.CtopAdConstant;
|
|
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.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import org.apache.shiro.SecurityUtils;
|
|
import org.apache.shiro.SecurityUtils;
|
|
@@ -33,7 +33,6 @@ import java.util.Map;
|
|
*/
|
|
*/
|
|
@Service
|
|
@Service
|
|
public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, ProjectMember> implements IProjectMemberService {
|
|
public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, ProjectMember> implements IProjectMemberService {
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ProjectMemberMapper memberMapper;
|
|
private ProjectMemberMapper memberMapper;
|
|
@Autowired
|
|
@Autowired
|
|
@@ -72,7 +71,8 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
}
|
|
}
|
|
|
|
|
|
//视频报表
|
|
//视频报表
|
|
- public List<ProjectMember> getProjects(List<Integer> mediaIds) {
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public List<ProjectMember> getProjects(List<Integer> mediaIds){
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
String userId = sysUser.getId();
|
|
String userId = sysUser.getId();
|
|
String roleCode = memberMapper.getRoleCodeByUserId(userId);
|
|
String roleCode = memberMapper.getRoleCodeByUserId(userId);
|
|
@@ -80,16 +80,18 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
|
|
|
|
//角色权限判断
|
|
//角色权限判断
|
|
List<ProjectMember> projectMemberList = null;
|
|
List<ProjectMember> projectMemberList = null;
|
|
- if (roleCode.equals("plan") || roleCode.equals("clip") || roleCode.equals("shot") || roleCode.equals("plane") || roleCode.equals("planeLeader")) {
|
|
|
|
|
|
+ if(roleCode.equals("plan") || roleCode.equals("clip") || roleCode.equals("shot") || roleCode.equals("plane")|| roleCode.equals("planeLeader")){
|
|
projectMemberList = memberMapper.designProjects(userId, mediaIds);
|
|
projectMemberList = memberMapper.designProjects(userId, mediaIds);
|
|
- } else if (roleCode.equals("designTeamLeader")) {
|
|
|
|
|
|
+ }else if( roleCode.equals("designTeamLeader")){
|
|
projectMemberList = memberMapper.designLeaderProjects(companyId, mediaIds);
|
|
projectMemberList = memberMapper.designLeaderProjects(companyId, mediaIds);
|
|
- } else if (roleCode.equals("admin")) {
|
|
|
|
|
|
+ }else if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
|
|
projectMemberList = memberMapper.adminProjects(mediaIds);
|
|
projectMemberList = memberMapper.adminProjects(mediaIds);
|
|
- } else if (roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")) {
|
|
|
|
|
|
+ }else if(roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")||roleCode.equals("huananyunying")){
|
|
projectMemberList = memberMapper.operationProjects(userId, mediaIds);
|
|
projectMemberList = memberMapper.operationProjects(userId, mediaIds);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ if(null == projectMemberList){
|
|
|
|
+ projectMemberList = new ArrayList<>();
|
|
|
|
+ }
|
|
return projectMemberList;
|
|
return projectMemberList;
|
|
}
|
|
}
|
|
|
|
|