From fc207d9489b69cad548d772c9e49b1ca873fc176 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Tue, 28 Sep 2021 11:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=95=99=E5=B8=88=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/class/index.vue | 59 +++++++++++++++++-- .../system/controller/SysUserController.java | 3 + .../project/system/mapper/SysUserMapper.java | 24 ++++++++ .../system/service/ISysUserService.java | 24 ++++++++ .../service/impl/SysUserServiceImpl.java | 33 +++++++++++ .../mybatis/system/SysUserMapper.xml | 54 +++++++++++++++++ 6 files changed, 191 insertions(+), 6 deletions(-) diff --git a/ruoyi-ui/src/views/system/class/index.vue b/ruoyi-ui/src/views/system/class/index.vue index 420b03afb..a12cf9ab6 100644 --- a/ruoyi-ui/src/views/system/class/index.vue +++ b/ruoyi-ui/src/views/system/class/index.vue @@ -232,9 +232,9 @@ - + - + - + { this.zbjsOptions = response.zbjs; this.pbjsOptions = response.pbjs; this.zljsOptions = response.zljs; + this.zbjsOptionsnotclass = response.zbjsnotclass; + this.pbjsOptionsnotclass = response.pbjsnotclass; + this.zljsOptionsnotclass = response.zljsnotclass; }); }, /** 修改按钮操作 */ @@ -423,12 +448,34 @@ export default { this.form = response.data; this.open = true; this.title = "修改班级信息"; + //console.log(response.data); + this.updateZbUserPush.nickName = response.data.zbjsxm; + this.updateZbUserPush.userId = response.data.zbjs; + this.updatePbUserPush.nickName = response.data.pbjsxm; + this.updatePbUserPush.userId = response.data.pbjs; + + this.updateZlUserPush.nickName = response.data.zljsxm; + this.updateZlUserPush.userId = response.data.zljs; + + //获取主班教师角色用户列表 //获取主班教师角色用户列表 getUsersByRoleId().then((response) => { this.zbjsOptions = response.zbjs; this.pbjsOptions = response.pbjs; this.zljsOptions = response.zljs; + this.zbjsOptionsnotclass = response.zbjsnotclass; + if (this.updateZbUserPush.nickName != null) { + this.zbjsOptionsnotclass.push(this.updateZbUserPush); + } + this.pbjsOptionsnotclass = response.pbjsnotclass; + if (this.updatePbUserPush.nickName != null) { + this.pbjsOptionsnotclass.push(this.updatePbUserPush); + } + this.zljsOptionsnotclass = response.zljsnotclass; + if (this.updateZlUserPush.nickName != null) { + this.zljsOptionsnotclass.push(this.updateZlUserPush); + } }); }); }, 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 1ef1e8440..e78cd343b 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 @@ -187,16 +187,19 @@ public class SysUserController extends BaseController { user.setUserId((long) 102); user.setDeptId(deptId); ajax.put("zbjs", userService.selectUserListByRoleId(user)); + ajax.put("zbjsnotclass", userService.selectUserListByRoleIdNotZbClass(user)); //配班教师 user = new SysUser(); user.setUserId((long) 104); user.setDeptId(deptId); ajax.put("pbjs", userService.selectUserListByRoleId(user)); + ajax.put("pbjsnotclass", userService.selectUserListByRoleIdNotPbClass(user)); //助理教师 user = new SysUser(); user.setUserId((long) 105); user.setDeptId(deptId); ajax.put("zljs", userService.selectUserListByRoleId(user)); + ajax.put("zljsnotclass", userService.selectUserListByRoleIdNotZlClass(user)); return ajax; } diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java index 11995b0c9..7b97b15be 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java @@ -69,6 +69,30 @@ public interface SysUserMapper */ public List selectUserListByRoleId(SysUser user); + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserListByRoleIdNotZbClass(SysUser user); + + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserListByRoleIdNotPbClass(SysUser user); + + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserListByRoleIdNotZlClass(SysUser user); + /** * 根据roleId查询用户列表 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java index 66226fd0b..78e37355e 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserService.java @@ -67,6 +67,30 @@ public interface ISysUserService */ public List selectUserListByRoleId(SysUser user); + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserListByRoleIdNotZbClass(SysUser user); + + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserListByRoleIdNotPbClass(SysUser user); + + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserListByRoleIdNotZlClass(SysUser user); + /** * 根据roleId查询用户列表 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java index de8807353..c51671231 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java @@ -125,6 +125,39 @@ public class SysUserServiceImpl implements ISysUserService { return userMapper.selectUserListByRoleId(sysUser); } + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + @Override + public List selectUserListByRoleIdNotZbClass(SysUser user){ + return userMapper.selectUserListByRoleIdNotZbClass(user); + } + + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + @Override + public List selectUserListByRoleIdNotPbClass(SysUser user){ + return userMapper.selectUserListByRoleIdNotPbClass(user); + } + + /** + * 根据roleId查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + @Override + public List selectUserListByRoleIdNotZlClass(SysUser user){ + return userMapper.selectUserListByRoleIdNotZlClass(user); + } + /** * 根据roleId查询用户列表 * diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml index dbe33b0ab..1db90d2c0 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml @@ -189,6 +189,60 @@ + + + + + +