From 7b05b57bd29518be0ddd615ba2deb396bbb49c77 Mon Sep 17 00:00:00 2001
From: "jiakun.lin" <mzh820631607@163.com>
Date: Tue, 23 Mar 2021 14:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=AE=A1=E8=83=BD=E7=9C=8B=E5=88=B0?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ProjectManagementMapper.java       |  6 ++---
 .../service/ProjectManagementService.java     | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
index be8201a..5d6be3e 100644
--- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
+++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
@@ -40,7 +40,7 @@ public interface ProjectManagementMapper {
     @Select({"<script>",
 //            "select projectId,projectName,projectPermissions,founder,creationTime,state,knowledgePoints,experimentIntroduction from hr_project_management where isdel=0",
             "select * from hr_project_management where 1 = 1",// (roleId NOT LIKE '%3%' AND isdel = 0)",
-            " <if test='userId==null'>AND roleId NOT LIKE '%3%' AND isdel = 0</if>",
+            " <if test='userId==null'>AND founder NOT LIKE '4' AND isdel = 0</if>",
             " <if test='userId!=null'>AND ((FIND_IN_SET(1,founder) AND isdel = 0) OR ( isdel = 0 AND userId = #{userId} ))</if>",//教师端，一开始进入项目管理，看见自己创建的和其他人看见的
             " <if test='projectPermissions!=null'> and projectPermissions=#{projectPermissions}</if>",
             " <if test='founder!=null'> and founder=#{founder}</if>",//教师选择创建人为系统
@@ -373,8 +373,8 @@ public interface ProjectManagementMapper {
      * @param userId
      * @return
      */
-    @Select("SELECT accountRole FROM user WHERE userId=#{userId}")
-    Integer queryRoleId(Integer userId);
+    @Select("SELECT roleId FROM hr_user_info WHERE userId=#{userId}")
+    String queryRoleId(Integer userId);
 
     /**
      * 查询项目名称
diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
index 1776d69..0a2c98e 100644
--- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
+++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java
@@ -39,16 +39,16 @@ public class ProjectManagementService {
     public HashMap<String, Object> queryRole(Integer userId) {
         HashMap<String, Object> resp = new HashMap<String, Object>();
         try {
-            Integer roleId = mapper.queryRoleId(userId);
+            String roleId = mapper.queryRoleId(userId);
             if (null != roleId) {
                 //角色为教师
-                if (roleId == 3) {
+                if ("14".equals(roleId)) {
                     resp.put("retvalue", 1);
                 }
                 //角色为管理员
-                else if (roleId == 1 || roleId == 2) {
+                else if ("13".equals(roleId) || "13,14".equals(roleId)) {
                     resp.put("retvalue", 0);
-                } else if (roleId == 4) {
+                } else if ("4".equals(roleId)) {
                     resp.put("retcode", 300);
                     resp.put("retvalue", "Role does not meet the requirements");
                     return resp;
@@ -78,16 +78,16 @@ public class ProjectManagementService {
         HashMap<String, Object> resp = new HashMap<String, Object>();
         try {
             //获取用户的角色信息
-            Integer roleId = mapper.queryRoleId(vo.getUserId());
+            String roleId = mapper.queryRoleId(vo.getUserId());
             if (null != roleId) {
                 //角色不对（学生没有权限）
-                if (roleId == 4) {
+                if ("4".equals(roleId)) {
                     resp.put("retcode", 300);
                     resp.put("retvalue", "抱歉，您的权限不能访问该地址！");
                     return resp;
                 }
                 //角色等于管理员或者超级管理员
-                else if (roleId == 1 ) {
+                else if ("1".equals(roleId)) {
                     vo.setUserId(null);
                 }
             }
@@ -115,16 +115,16 @@ public class ProjectManagementService {
         HashMap<String, Object> resp = new HashMap<String, Object>();
         try {
             //获取用户的角色信息
-            Integer roleId = mapper.queryRoleId(vo.getUserId());
+            String roleId = mapper.queryRoleId(vo.getUserId());
             if (null != roleId) {
                 //角色不对（学生没有权限）
-                if (roleId == 4) {
+                if ("4".equals(roleId)) {
                     resp.put("retcode", 300);
                     resp.put("retvalue", "抱歉，您的权限不能访问该地址！");
                     return resp;
                 }
-                //角色等于管理员或者超级管理员
-                else if (roleId == 1 ) {
+                //角色等于超级管理员
+                else if ("1".equals(roleId)) {
                     vo.setUserId(null);
                 }
             }