粮库决策温度查询问题和代储点去除代储企业功能

src/main/java/com/chinaitop/depot/system/controller/RoleInfoController.java

@@ -148,16 +148,6 @@ public class RoleInfoController {
 		if (Id != null) {
 			roleId = roleInfoService.findByuserId(Id);
 		}
-		if (roleId != null) {
-			roleInfo = roleInfoService.findById(roleId);
-			roleName = roleInfo.getRoleName();
-			if (roleName.equals("保管员")){
-				roleId = roleInfo.getRoleId();
-			}else {
-				roleId = null;
-			}
-
-		}
 
 		return roleId;
 	}

src/main/java/com/chinaitop/depot/system/mapper/RoleInfoMapper.xml

@@ -85,10 +85,14 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from role_info
-    where role_id = #{roleId,jdbcType=INTEGER}
+    SELECT
+      role.*
+    FROM
+      role_info role
+        INNER JOIN user_role users ON users.role_id = role.role_id
+    WHERE
+      role.role_name = '保管员'
+      AND users.user_id = #{Id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from role_info