From 00db34e50298414657980e8e6e2d3839b95f2bca Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Fri, 24 Apr 2020 16:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AE=A1=E7=90=86=E5=AD=A6?=
 =?UTF-8?q?=E6=A0=A1=E5=88=86=E5=88=AB=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/project/system/controller/SysUserController.java | 2 +-
 .../project/system/service/impl/ByTeacherJbxxServiceImpl.java  | 3 +++
 ruoyi/src/main/resources/application.yml                       | 2 +-
 .../src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml  | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

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 96fc39c42..c57ebf87f 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
@@ -6,7 +6,6 @@ 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;
@@ -173,6 +172,7 @@ public class SysUserController extends BaseController
         {
             ByTeacherJbxx byTeacherJbxx = new ByTeacherJbxx();
             //并赋值给教师userid
+            //user可以直接获取出入数据的主键值
             byTeacherJbxx.setUserid(user.getUserId());
             byTeacherJbxx.setCreatetime(new Date());
             //插入数据到教师表
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByTeacherJbxxServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByTeacherJbxxServiceImpl.java
index 2cff29ab2..d47219cff 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByTeacherJbxxServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/ByTeacherJbxxServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.project.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.system.mapper.ByTeacherJbxxMapper;
@@ -38,6 +40,7 @@ public class ByTeacherJbxxServiceImpl implements IByTeacherJbxxService
      * @return 教师基本信息
      */
     @Override
+    @DataScope(deptAlias = "u")
     public List<ByTeacherJbxx> selectByTeacherJbxxList(ByTeacherJbxx byTeacherJbxx)
     {
         return byTeacherJbxxMapper.selectByTeacherJbxxList(byTeacherJbxx);
diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml
index 3881fa71c..424c5dfdd 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -57,7 +57,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: localhost
+    host: 120.53.14.147
     # 端口，默认为6379
     port: 6379
     # 密码
diff --git a/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml b/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml
index 07c9d6d64..53b11ce15 100644
--- a/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/ByTeacherJbxxMapper.xml
@@ -50,9 +50,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectByTeacherJbxxList" parameterType="ByTeacherJbxx" resultMap="ByTeacherJbxxResult">
         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.nick_name
+        u.user_id, u.nick_name,u.dept_id,u.del_flag
         from by_teacher_jbxx t
         left join sys_user u on t.userid = u.user_id
+        where u.del_flag='0'
         <if test="userid != null "> and userid = #{userid}</if>
         <if test="zjhm != null  and zjhm != ''"> and zjhm = #{zjhm}</if>
         <if test="csrq != null "> and csrq = #{csrq}</if>