修正bug

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -1,5 +1,7 @@
 package com.ruoyi.common.core.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,6 +13,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 部门表 sys_dept
@@ -23,7 +26,7 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
-    @Id
+    @TableId
     private Long deptId;
 
     /** 父部门ID */
@@ -55,7 +58,7 @@ public class SysDept extends BaseEntity
     private String deleteFlag;
 
     /** 父部门名称 */
-    private String parentName;
+//    private String parentName;
 
     //
     private String tenantId;
@@ -63,6 +66,7 @@ public class SysDept extends BaseEntity
     private String deptType;
 
     /** 子部门 */
+    @TableField(exist = false)
     private List<SysDept> children = new ArrayList<SysDept>();
 
     public Long getDeptId()
@@ -171,14 +175,19 @@ public class SysDept extends BaseEntity
         this.deleteFlag = deleteFlag;
     }
 
+    @Override
+    public Map<String, Object> getParams() {
+        return null;
+    }
+
     public String getParentName()
     {
-        return parentName;
+        return null;
     }
 
     public void setParentName(String parentName)
     {
-        this.parentName = parentName;
+//        this.parentName = parentName;
     }
 
     public List<SysDept> getChildren()

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -85,6 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
+		<if test="teacher != null">
+			AND u.teacher = #{teacher}
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>