Browse Source

修改权限问题

yumeng 3 years ago
parent
commit
6403b77955

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -132,7 +132,9 @@ public class AdvertiserController {
             userCompanyQueryWrapper.orderByDesc("create_time");
             userCompanyQueryWrapper.last("limit 1");
             UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
-            queryWrapper.eq("company_id", userCompany.getCompanyId());
+            if (!Check.isNull(userCompany)) {
+                queryWrapper.eq("company_id", userCompany.getCompanyId());
+            }
         }
 
         Page<Advertiser> page = new Page<>(pageNo, pageSize);

+ 12 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -15,11 +15,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.entity.SysUser;
 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.TransferAccount;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
@@ -256,22 +254,28 @@ public class ProjectController {
         Result<IPage<Project>> result = new Result<>();
         String projectName = project.getProjectName();
         project.setProjectName(null);
+        String userId = project.getUserId();
+        project.setUserId(null);
+
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         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)) {
-            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)) {
-            queryWrapper.eq("design_responsible_id", sysUser.getId());
+            queryWrapper.eq("design_responsible_id", userId);
         } else if (roleCode.contains("sale")) {
             QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
-            userCompanyQueryWrapper.eq("user_id", sysUser.getId());
+            userCompanyQueryWrapper.eq("user_id", userId);
             userCompanyQueryWrapper.orderByDesc("create_time");
             userCompanyQueryWrapper.last("limit 1");
             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)) {
             queryWrapper.like("project_name", projectName);