diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ProjectGroup.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ProjectGroup.java index 73abb2d..e897d83 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ProjectGroup.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/ProjectGroup.java @@ -14,4 +14,5 @@ public class ProjectGroup { Integer staffId; Integer projectId; String projectStaffPosition; + Integer projectAccessLevel; } diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java index d6fc875..225671d 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/IProjectGroupService.java @@ -9,5 +9,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IProjectGroupService extends IService { Boolean addCreator(Integer projectId, Integer staffId); - Integer getUserLevelInGroup(String token,Integer projectId); + + /** + * @return 如果不存在就返回0,否则返回AccessLevel + */ + Integer getUserLevelInGroup(String token, Integer projectId); } \ No newline at end of file diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java index 1687e5c..3fd794b 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/ProjectGroupServiceImpl.java @@ -1,7 +1,6 @@ package cn.edu.hfut.rmdjzz.projectmanagement.service.impl; import cn.edu.hfut.rmdjzz.projectmanagement.entity.ProjectGroup; -import cn.edu.hfut.rmdjzz.projectmanagement.entity.Staff; import cn.edu.hfut.rmdjzz.projectmanagement.mapper.ProjectGroupMapper; import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService; import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils; @@ -9,8 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import java.io.Serializable; - /** * @author 张韬 * created at 2022/6/30 21:38 @@ -24,25 +21,23 @@ public class ProjectGroupServiceImpl extends ServiceImpllambdaQuery().eq(ProjectGroup::getStaffId, staffId).eq(ProjectGroup::getProjectId, projectId)); - if(projectGroup == null) + public Integer getUserLevelInGroup(String token, Integer projectId) { + try { + Integer staffId = TokenUtils.getStaffId(token); + ProjectGroup projectGroup = baseMapper.selectOne(Wrappers.lambdaQuery() + .eq(ProjectGroup::getStaffId, staffId) + .eq(ProjectGroup::getProjectId, projectId) + ); + if (projectGroup == null) return 0; - else if(projectGroup.getProjectStaffPosition().equals("负责人")) - return 3; - else if(projectGroup.getProjectStaffPosition().length()>0) - return 1; - else - return 0; - }catch(Exception e){//需要调整 + return projectGroup.getProjectAccessLevel(); + } catch (Exception e) { return 0; } }