From bbf9bb35ac5133ee210c5e91553e6e316ddbbe23 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 24 Apr 2020 10:28:55 +0800
Subject: [PATCH] =?UTF-8?q?20200424-lc-1=20=E5=A2=9E=E5=8A=A0=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=E7=AE=A1=E7=90=86=E5=85=B3=E8=81=94=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/teacher/index.vue   |  39 +-
 .../system/controller/SysUserController.java  |  31 +-
 .../project/system/domain/ByTeacherJbxx.java  |   5 +
 .../ruoyi/project/system/domain/SysUser.java  | 664 +++++++++---------
 .../mybatis/system/ByTeacherJbxxMapper.xml    |   4 +-
 .../mybatis/system/SysRoleMapper.xml          |   9 +-
 6 files changed, 394 insertions(+), 358 deletions(-)

diff --git a/ruoyi-ui/src/views/system/teacher/index.vue b/ruoyi-ui/src/views/system/teacher/index.vue
index 2c1656e36..2233a7dc4 100644
--- a/ruoyi-ui/src/views/system/teacher/index.vue
+++ b/ruoyi-ui/src/views/system/teacher/index.vue
@@ -36,7 +36,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <el-col :span="1.5" v-show="false">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -79,29 +79,21 @@
     <el-table v-loading="loading" :data="teacherList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="用户名称" align="center" prop="user.nickName" />
-      <!--<el-table-column label="标识" align="center" prop="id" />
-      <el-table-column label="证件号码" align="center" prop="zjhm" />
-      <el-table-column label="出生日期" align="center" prop="csrq" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.csrq) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="csrq" width="180"></el-table-column>
       <el-table-column label="毕业院校" align="center" prop="byyx" />
-      <el-table-column label="专业" align="center" prop="zy" />-->
-      <el-table-column label="学历" align="center" prop="xl" :formatter="xlFormat" />
-      <el-table-column label="学位" align="center" prop="xw" :formatter="xwFormat" />
-      <!--<el-table-column label="参加工作日期" align="center" prop="cjgzrq" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.cjgzrq) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="资格证书" align="center" prop="zgzs" :formatter="zgzsFormat" />
-      <el-table-column label="创建人" align="center" prop="createuserid" />-->
+      <el-table-column label="专业" align="center" prop="zy" />
+      <el-table-column label="参加工作日期" align="center" prop="cjgzrq" width="180"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createtime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createtime) }}</span>
         </template>
       </el-table-column>
+      <!--<el-table-column label="标识" align="center" prop="id" />
+      <el-table-column label="证件号码" align="center" prop="zjhm" />
+      <el-table-column label="学历" align="center" prop="xl" :formatter="xlFormat" />
+      <el-table-column label="学位" align="center" prop="xw" :formatter="xwFormat" />
+      <el-table-column label="资格证书" align="center" prop="zgzs" :formatter="zgzsFormat" />
+      <el-table-column label="创建人" align="center" prop="createuserid" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -133,8 +125,11 @@
     <!-- 添加或修改教师基本信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户id" prop="userid">
-          <el-input v-model="form.userid" placeholder="请输入用户id" />
+        <el-form-item label="id" prop="id" v-show="false">
+          <el-input v-model="form.id" />
+        </el-form-item>
+        <el-form-item label="用户id" prop="userid" v-show="false">
+          <el-input v-model="form.userid" />
         </el-form-item>
         <el-form-item label="证件号码" prop="zjhm">
           <el-input v-model="form.zjhm" placeholder="请输入证件号码" />
@@ -357,7 +352,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgError(response.msg);
+                // this.msgError(response.msg);
               }
             });
           } else {
@@ -367,7 +362,7 @@ export default {
                 this.open = false;
                 this.getList();
               } else {
-                this.msgError(response.msg);
+                //this.msgError(response.msg);
               }
             });
           }
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 ea91c90e7..96fc39c42 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,8 +1,12 @@
 package com.ruoyi.project.system.controller;
 
+import java.util.Date;
 import java.util.List;
 
 import com.ruoyi.project.common.SchoolCommon;
+import com.ruoyi.project.system.domain.ByTeacherJbxx;
+import com.ruoyi.project.system.service.*;
+import com.ruoyi.project.system.service.impl.ByTeacherJbxxServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -28,9 +32,6 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysPostService;
-import com.ruoyi.project.system.service.ISysRoleService;
-import com.ruoyi.project.system.service.ISysUserService;
 
 /**
  * 用户信息
@@ -47,6 +48,9 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysRoleService roleService;
 
+    @Autowired
+    private IByTeacherJbxxService byTeacherJbxxService;
+
     @Autowired
     private ISysPostService postService;
 
@@ -56,6 +60,11 @@ public class SysUserController extends BaseController
     @Autowired
     private SchoolCommon schoolCommon;
 
+
+
+
+
+
     /**
      * 获取用户列表
      */
@@ -106,8 +115,10 @@ public class SysUserController extends BaseController
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
         AjaxResult ajax = AjaxResult.success();
+        //在添加用户时判断是否为幼儿园平台
         if(schoolCommon.isSchool()==true)
         {
+            //只显示幼儿园相关的岗位和角色
             ajax.put("roles", roleService.selectYeyRoleAll());
             ajax.put("posts", postService.selectYeyPostAll());
         }else {
@@ -115,6 +126,7 @@ public class SysUserController extends BaseController
             ajax.put("posts", postService.selectPostAll());
         }
 
+        //在修改用户时判断是否为幼儿园平台
         if (StringUtils.isNotNull(userId))
         {
             if (schoolCommon.isSchool()==true)
@@ -156,7 +168,18 @@ public class SysUserController extends BaseController
         user.setEmail(user.getUserName()+"@benyi.com");
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        return toAjax(userService.insertUser(user));
+        int bl = userService.insertUser(user);
+        if (bl>0)
+        {
+            ByTeacherJbxx byTeacherJbxx = new ByTeacherJbxx();
+            //并赋值给教师userid
+            byTeacherJbxx.setUserid(user.getUserId());
+            byTeacherJbxx.setCreatetime(new Date());
+            //插入数据到教师表
+            byTeacherJbxxService.insertByTeacherJbxx(byTeacherJbxx);
+        }
+        return toAjax(bl);
+
     }
 
     /**
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByTeacherJbxx.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByTeacherJbxx.java
index 7af9d71fe..2cfea78c8 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByTeacherJbxx.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/ByTeacherJbxx.java
@@ -1,12 +1,14 @@
 package com.ruoyi.project.system.domain;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
 import java.util.Date;
 
+
 /**
  * 教师基本信息对象 by_teacher_jbxx
  * 
@@ -30,6 +32,7 @@ public class ByTeacherJbxx extends BaseEntity
 
     /** 出生日期 */
     @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date csrq;
 
     /** 毕业院校 */
@@ -50,6 +53,7 @@ public class ByTeacherJbxx extends BaseEntity
 
     /** 参加工作日期 */
     @Excel(name = "参加工作日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date cjgzrq;
 
     /** 资格证书 */
@@ -62,6 +66,7 @@ public class ByTeacherJbxx extends BaseEntity
 
     //创建时间
     @Excel(name = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createtime;
 
     /** user对象 */
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 88a80c3a7..e38c22f5d 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -1,326 +1,338 @@
-package com.ruoyi.project.system.domain;
-
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
-import com.ruoyi.framework.aspectj.lang.annotation.Excels;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 用户对象 sys_user
- * 
- * @author ruoyi
- */
-public class SysUser extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
-
-    /** 部门ID */
-    @Excel(name = "部门编号", type = Type.IMPORT)
-    private Long deptId;
-
-    /** 用户账号 */
-    @Excel(name = "登录名称")
-    private String userName;
-
-    /** 用户昵称 */
-    @Excel(name = "用户名称")
-    private String nickName;
-
-    /** 用户邮箱 */
-    @Excel(name = "用户邮箱")
-    private String email;
-
-    /** 手机号码 */
-    @Excel(name = "手机号码")
-    private String phonenumber;
-
-    /** 用户性别 */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
-    private String sex;
-
-    /** 用户头像 */
-    private String avatar;
-
-    /** 密码 */
-    private String password;
-
-    /** 盐加密 */
-    private String salt;
-
-    /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    /** 最后登陆IP */
-    @Excel(name = "最后登陆IP", type = Type.EXPORT)
-    private String loginIp;
-
-    /** 最后登陆时间 */
-    @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
-    private Date loginDate;
-
-    /** 部门对象 */
-    @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
-    })
-    private SysDept dept;
-
-    /** 角色对象 */
-    private List<SysRole> roles;
-
-    /** 角色组 */
-    private Long[] roleIds;
-
-    /** 岗位组 */
-    private Long[] postIds;
-
-    public SysUser()
-    {
-
-    }
-
-    public SysUser(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public boolean isAdmin()
-    {
-        return isAdmin(this.userId);
-    }
-
-    public static boolean isAdmin(Long userId)
-    {
-        return userId != null && 1L == userId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
-    {
-        return nickName;
-    }
-
-    public void setNickName(String nickName)
-    {
-        this.nickName = nickName;
-    }
-
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
-
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
-
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
-    {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber)
-    {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getSex()
-    {
-        return sex;
-    }
-
-    public void setSex(String sex)
-    {
-        this.sex = sex;
-    }
-
-    public String getAvatar()
-    {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar)
-    {
-        this.avatar = avatar;
-    }
-
-    @JsonProperty
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    public String getSalt()
-    {
-        return salt;
-    }
-
-    public void setSalt(String salt)
-    {
-        this.salt = salt;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getLoginIp()
-    {
-        return loginIp;
-    }
-
-    public void setLoginIp(String loginIp)
-    {
-        this.loginIp = loginIp;
-    }
-
-    public Date getLoginDate()
-    {
-        return loginDate;
-    }
-
-    public void setLoginDate(Date loginDate)
-    {
-        this.loginDate = loginDate;
-    }
-
-    public SysDept getDept()
-    {
-        return dept;
-    }
-
-    public void setDept(SysDept dept)
-    {
-        this.dept = dept;
-    }
-
-    public List<SysRole> getRoles()
-    {
-        return roles;
-    }
-
-    public void setRoles(List<SysRole> roles)
-    {
-        this.roles = roles;
-    }
-
-    public Long[] getRoleIds()
-    {
-        return roleIds;
-    }
-
-    public void setRoleIds(Long[] roleIds)
-    {
-        this.roleIds = roleIds;
-    }
-
-    public Long[] getPostIds()
-    {
-        return postIds;
-    }
-
-    public void setPostIds(Long[] postIds)
-    {
-        this.postIds = postIds;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("userName", getUserName())
-            .append("nickName", getNickName())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("salt", getSalt())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-            .toString();
-    }
-}
+package com.ruoyi.project.system.domain;
+
+import java.util.Date;
+import java.util.List;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
+import com.ruoyi.framework.aspectj.lang.annotation.Excels;
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+/**
+ * 用户对象 sys_user
+ * 
+ * @author ruoyi
+ */
+public class SysUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
+    private Long userId;
+
+    /** 部门ID */
+    @Excel(name = "部门编号", type = Type.IMPORT)
+    private Long deptId;
+
+    /** 用户账号 */
+    @Excel(name = "登录名称")
+    private String userName;
+
+    /** 用户昵称 */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    /** 用户邮箱 */
+    @Excel(name = "用户邮箱")
+    private String email;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
+    /** 用户性别 */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 盐加密 */
+    private String salt;
+
+    /** 帐号状态（0正常 1停用） */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登陆IP */
+    @Excel(name = "最后登陆IP", type = Type.EXPORT)
+    private String loginIp;
+
+    /** 最后登陆时间 */
+    @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    private Date loginDate;
+
+    /** 部门对象 */
+    @Excels({
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
+        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+    })
+    private SysDept dept;
+
+    /** 角色对象 */
+    private List<SysRole> roles;
+
+    /** 角色组 */
+    private Long[] roleIds;
+
+    /** 岗位组 */
+    private Long[] postIds;
+
+    /**教师对象*/
+    private ByTeacherJbxx byTeacherJbxx;
+
+    public SysUser()
+    {
+
+    }
+
+    public SysUser(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
+    {
+        return userId != null && 1L == userId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    public String getNickName()
+    {
+        return nickName;
+    }
+
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
+    public String getEmail()
+    {
+        return email;
+    }
+
+    public void setEmail(String email)
+    {
+        this.email = email;
+    }
+
+    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
+    public String getPhonenumber()
+    {
+        return phonenumber;
+    }
+
+    public void setPhonenumber(String phonenumber)
+    {
+        this.phonenumber = phonenumber;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getAvatar()
+    {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar)
+    {
+        this.avatar = avatar;
+    }
+
+    @JsonProperty
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getSalt()
+    {
+        return salt;
+    }
+
+    public void setSalt(String salt)
+    {
+        this.salt = salt;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getDelFlag()
+    {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getLoginIp()
+    {
+        return loginIp;
+    }
+
+    public void setLoginIp(String loginIp)
+    {
+        this.loginIp = loginIp;
+    }
+
+    public Date getLoginDate()
+    {
+        return loginDate;
+    }
+
+    public void setLoginDate(Date loginDate)
+    {
+        this.loginDate = loginDate;
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
+
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+    }
+
+    public List<SysRole> getRoles()
+    {
+        return roles;
+    }
+
+    public void setRoles(List<SysRole> roles)
+    {
+        this.roles = roles;
+    }
+
+    public Long[] getRoleIds()
+    {
+        return roleIds;
+    }
+
+    public void setRoleIds(Long[] roleIds)
+    {
+        this.roleIds = roleIds;
+    }
+
+    public Long[] getPostIds()
+    {
+        return postIds;
+    }
+
+    public void setPostIds(Long[] postIds)
+    {
+        this.postIds = postIds;
+    }
+    
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .append("userName", getUserName())
+            .append("nickName", getNickName())
+            .append("email", getEmail())
+            .append("phonenumber", getPhonenumber())
+            .append("sex", getSex())
+            .append("avatar", getAvatar())
+            .append("password", getPassword())
+            .append("salt", getSalt())
+            .append("status", getStatus())
+            .append("delFlag", getDelFlag())
+            .append("loginIp", getLoginIp())
+            .append("loginDate", getLoginDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("dept", getDept())
+            .append("byTeacherJbxx", getByTeacherJbxx())
+            .toString();
+    }
+
+    public ByTeacherJbxx getByTeacherJbxx() {
+        return byTeacherJbxx;
+    }
+
+    public void setByTeacherJbxx(ByTeacherJbxx byTeacherJbxx) {
+        this.byTeacherJbxx = byTeacherJbxx;
+    }
+}
diff --git a/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml b/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml
index 72d27d05c..2ea6e1252 100644
--- a/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectByTeacherJbxxVo">
         select t.id, t.userid, t.zjhm, t.csrq, t.byyx, t.zy, t.xl, t.xw, t.cjgzrq, t.zgzs, t.createuserid, t.createtime,
-        u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.sex, u.status as user_status
+        u.user_id, u.nick_name, u.status as user_status
         from by_teacher_jbxx t
-            left join sys_user u on t.userid = u.user_id
+            right join sys_user u on t.userid = u.user_id
     </sql>
 
     <select id="selectByTeacherJbxxList" parameterType="ByTeacherJbxx" resultMap="ByTeacherJbxxResult">
diff --git a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
index afab94afc..bc563ecfc 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
@@ -58,11 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
+		WHERE r.del_flag = '0'
 	</select>
 
 	<select id="selectYeyRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		where r.purpose = '1'
+		where r.purpose = '1' and r.del_flag = '0'
 	</select>
 	
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
@@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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 u.user_id = #{userId}
+	    where u.user_id = #{userId} and r.del_flag = '0'
 	</select>
 
 	<select id="selectYeyRoleListByUserId" parameterType="Long" resultType="Integer">
@@ -78,12 +79,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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}
+	    where r.purpose = '1' and u.user_id = #{userId} and r.del_flag = '0'
 	</select>
 	
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
-		where r.role_id = #{roleId}
+		where r.role_id = #{roleId} and r.del_flag = '0'
 	</select>
 	
 	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">