From c02d46a6bd5adbd807055526bd1606facd48ad3f Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Mon, 20 Apr 2020 20:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BC=E5=84=BF=E5=9B=AD=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E4=B8=8E?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/user/index.vue      | 10 ++++----
 .../system/controller/SysUserController.java  | 24 +++++++++++++++++--
 .../project/system/mapper/SysPostMapper.java  |  8 +++++++
 .../project/system/mapper/SysRoleMapper.java  |  6 +++++
 .../system/service/ISysPostService.java       |  6 +++++
 .../system/service/ISysRoleService.java       | 10 ++++++++
 .../service/impl/SysPostServiceImpl.java      | 12 ++++++++++
 .../service/impl/SysRoleServiceImpl.java      | 17 +++++++++++++
 .../mybatis/system/SysPostMapper.xml          | 13 ++++++++++
 .../mybatis/system/SysRoleMapper.xml          | 13 ++++++++++
 10 files changed, 113 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 00089330d..2d5910364 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -142,7 +142,7 @@
             align="center"
             prop="dept.deptName"
             :show-overflow-tooltip="true"
-          /> 
+          />
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
               <el-switch
@@ -217,7 +217,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="登录账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入手机号码" maxlength="11"/>
+              <el-input v-model="form.userName" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -407,10 +407,12 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true,
+          {
+            required: true,
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur" }
+            trigger: "blur"
+          }
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 4403faf5b..ea91c90e7 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -1,6 +1,8 @@
 package com.ruoyi.project.system.controller;
 
 import java.util.List;
+
+import com.ruoyi.project.common.SchoolCommon;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -51,6 +53,9 @@ public class SysUserController extends BaseController
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private SchoolCommon schoolCommon;
+
     /**
      * 获取用户列表
      */
@@ -101,10 +106,25 @@ public class SysUserController extends BaseController
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("roles", roleService.selectRoleAll());
-        ajax.put("posts", postService.selectPostAll());
+        if(schoolCommon.isSchool()==true)
+        {
+            ajax.put("roles", roleService.selectYeyRoleAll());
+            ajax.put("posts", postService.selectYeyPostAll());
+        }else {
+            ajax.put("roles", roleService.selectRoleAll());
+            ajax.put("posts", postService.selectPostAll());
+        }
+
         if (StringUtils.isNotNull(userId))
         {
+            if (schoolCommon.isSchool()==true)
+            {
+                ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
+                ajax.put("postIds", postService.selectYeyPostListByUserId(userId));
+                ajax.put("roleIds", roleService.selectYeyRoleListByUserId(userId));
+            }else {
+
+            }
             ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java
index 2cb34f788..1e08088e3 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java
@@ -25,6 +25,9 @@ public interface SysPostMapper
      */
     public List<SysPost> selectPostAll();
 
+    //查询所有幼儿园岗位
+    public List<SysPost> selectYeyPostAll();
+
     /**
      * 通过岗位ID查询岗位信息
      * 
@@ -33,6 +36,8 @@ public interface SysPostMapper
      */
     public SysPost selectPostById(Long postId);
 
+
+
     /**
      * 根据用户ID获取岗位选择框列表
      * 
@@ -41,6 +46,9 @@ public interface SysPostMapper
      */
     public List<Integer> selectPostListByUserId(Long userId);
 
+    //根据用户id获取幼儿园岗位
+    public List<Integer> selectYeyPostListByUserId(Long userId);
+
     /**
      * 查询用户所属岗位组
      * 
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java
index 200bb1ebe..bda369f86 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java
@@ -33,6 +33,9 @@ public interface SysRoleMapper
      */
     public List<SysRole> selectRoleAll();
 
+    //查询所有幼儿园角色
+    public List<SysRole> selectYeyRoleAll();
+
     /**
      * 根据用户ID获取角色选择框列表
      * 
@@ -41,6 +44,9 @@ public interface SysRoleMapper
      */
     public List<Integer> selectRoleListByUserId(Long userId);
 
+    //根据用户ID获取幼儿园角色
+    public List<Integer> selectYeyRoleListByUserId(Long userId);
+
     /**
      * 通过角色ID查询角色
      * 
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
index 5696e0835..6c22ca4b1 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java
@@ -25,6 +25,9 @@ public interface ISysPostService
      */
     public List<SysPost> selectPostAll();
 
+    //查询所有幼儿园岗位
+    public List<SysPost> selectYeyPostAll();
+
     /**
      * 通过岗位ID查询岗位信息
      * 
@@ -41,6 +44,9 @@ public interface ISysPostService
      */
     public List<Integer> selectPostListByUserId(Long userId);
 
+    //根据用户id获取幼儿园岗位
+    public List<Integer> selectYeyPostListByUserId(Long userId);
+
     /**
      * 校验岗位名称
      * 
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java
index fbd561728..e73ac2817 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java
@@ -34,6 +34,13 @@ public interface ISysRoleService
      */
     public List<SysRole> selectRoleAll();
 
+    /**
+     * 查询所有幼儿园用途标识角色
+     *
+     * @return 角色列表
+     */
+    public List<SysRole> selectYeyRoleAll();
+
     /**
      * 根据用户ID获取角色选择框列表
      * 
@@ -42,6 +49,9 @@ public interface ISysRoleService
      */
     public List<Integer> selectRoleListByUserId(Long userId);
 
+    //根据用户id获取幼儿园角色选择框
+    public List<Integer> selectYeyRoleListByUserId(Long userId);
+
     /**
      * 通过角色ID查询角色
      * 
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
index e60dc0684..b64e5aea5 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
@@ -48,6 +48,12 @@ public class SysPostServiceImpl implements ISysPostService
         return postMapper.selectPostAll();
     }
 
+    @Override
+    public List<SysPost> selectYeyPostAll()
+    {
+        return postMapper.selectYeyPostAll();
+    }
+
     /**
      * 通过岗位ID查询岗位信息
      * 
@@ -71,6 +77,12 @@ public class SysPostServiceImpl implements ISysPostService
         return postMapper.selectPostListByUserId(userId);
     }
 
+    @Override
+    public List<Integer> selectYeyPostListByUserId(Long userId)
+    {
+        return postMapper.selectYeyPostListByUserId(userId);
+    }
+
     /**
      * 校验岗位名称是否唯一
      * 
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
index 4ca63e4b3..7e988b174 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
@@ -85,6 +85,16 @@ public class SysRoleServiceImpl implements ISysRoleService
         return roleMapper.selectRoleAll();
     }
 
+    /**
+     * 查询所有幼儿园角色
+     *
+     * @return 角色列表
+     */
+    public List<SysRole> selectYeyRoleAll()
+    {
+        return roleMapper.selectYeyRoleAll();
+    }
+
     /**
      * 根据用户ID获取角色选择框列表
      * 
@@ -96,6 +106,13 @@ public class SysRoleServiceImpl implements ISysRoleService
         return roleMapper.selectRoleListByUserId(userId);
     }
 
+    //根据用户id获取幼儿园角色
+    @Override
+    public List<Integer> selectYeyRoleListByUserId(Long userId)
+    {
+        return selectYeyRoleListByUserId(userId);
+    }
+
     /**
      * 通过角色ID查询角色
      * 
diff --git a/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml
index d36d7b121..a7d47d975 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysPostMapper.xml
@@ -41,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectPostAll" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
 	</select>
+
+	<select id="selectYeyPostAll" resultMap="SysPostResult">
+		<include refid="selectPostVo"/>
+		where purp = '1'
+	</select>
 	
 	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
@@ -54,6 +59,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user u on u.user_id = up.user_id
 	    where u.user_id = #{userId}
 	</select>
+
+	<select id="selectYeyPostListByUserId" parameterType="Long" resultType="Integer">
+		select p.post_id
+        from sys_post p
+	        left join sys_user_post up on up.post_id = p.post_id
+	        left join sys_user u on u.user_id = up.user_id
+	    where p.purp = '1' and u.user_id = #{userId}
+	</select>
 	
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
 		select p.post_id, p.post_name, p.post_code
diff --git a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
index d52ef5a6e..42e779d45 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
@@ -59,6 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 	</select>
+
+	<select id="selectYeyRoleAll" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		where r.purpose = '1'
+	</select>
 	
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
 		select r.role_id
@@ -67,6 +72,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	        left join sys_user u on u.user_id = ur.user_id
 	    where u.user_id = #{userId}
 	</select>
+
+	<select id="selectYeyRoleListByUserId" parameterType="Long" resultType="Integer">
+		select r.role_id
+        from sys_role r
+	        left join sys_user_role ur on ur.role_id = r.role_id
+	        left join sys_user u on u.user_id = ur.user_id
+	    where r.purpose = '1' and u.user_id = #{userId}
+	</select>
 	
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>