|
@@ -15,11 +15,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
-import org.apache.shiro.SecurityUtils;
|
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.system.entity.SysUser;
|
|
import org.jeecg.common.system.entity.SysUser;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
-import org.jeecg.common.system.vo.LoginUser;
|
|
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.entity.ProjectMember;
|
|
import org.jeecg.modules.ctop.entity.TransferAccount;
|
|
import org.jeecg.modules.ctop.entity.TransferAccount;
|
|
import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
|
|
import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
|
|
@@ -256,22 +254,28 @@ public class ProjectController {
|
|
Result<IPage<Project>> result = new Result<>();
|
|
Result<IPage<Project>> result = new Result<>();
|
|
String projectName = project.getProjectName();
|
|
String projectName = project.getProjectName();
|
|
project.setProjectName(null);
|
|
project.setProjectName(null);
|
|
|
|
+ String userId = project.getUserId();
|
|
|
|
+ project.setUserId(null);
|
|
|
|
+
|
|
QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
|
|
QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
|
|
Page<Project> page = new Page<>(pageNo, pageSize);
|
|
Page<Project> page = new Page<>(pageNo, pageSize);
|
|
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
- String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
- queryWrapper.eq("responsible_id", sysUser.getId());
|
|
|
|
|
|
+ queryWrapper.eq("responsible_id", userId);
|
|
|
|
|
|
} else if ("plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode) || "designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode)) {
|
|
} else if ("plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode) || "designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode)) {
|
|
- queryWrapper.eq("design_responsible_id", sysUser.getId());
|
|
|
|
|
|
+ queryWrapper.eq("design_responsible_id", userId);
|
|
} else if (roleCode.contains("sale")) {
|
|
} else if (roleCode.contains("sale")) {
|
|
QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
|
|
- userCompanyQueryWrapper.eq("user_id", sysUser.getId());
|
|
|
|
|
|
+ userCompanyQueryWrapper.eq("user_id", userId);
|
|
userCompanyQueryWrapper.orderByDesc("create_time");
|
|
userCompanyQueryWrapper.orderByDesc("create_time");
|
|
userCompanyQueryWrapper.last("limit 1");
|
|
userCompanyQueryWrapper.last("limit 1");
|
|
UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
|
|
- queryWrapper.eq("company_id", userCompany.getCompanyId());
|
|
|
|
|
|
+ if (!Check.isNull(userCompany)) {
|
|
|
|
+ queryWrapper.eq("company_id", userCompany.getCompanyId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (!Check.isNull(projectName)) {
|
|
if (!Check.isNull(projectName)) {
|
|
queryWrapper.like("project_name", projectName);
|
|
queryWrapper.like("project_name", projectName);
|