修改dept表名为sys_dept

guns-admin/src/main/java/com/stylefeng/guns/common/persistence/model/Dept.java

@@ -2,6 +2,7 @@ package com.stylefeng.guns.common.persistence.model;
 
 
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.enums.IdType;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
@@ -14,6 +15,7 @@ import java.io.Serializable;
  * @author stylefeng
  * @author stylefeng
  * @since 2017-07-11
  * @since 2017-07-11
  */
  */
+@TableName("sys_dept")
 public class Dept extends Model<Dept> {
 public class Dept extends Model<Dept> {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptDao.xml

@@ -11,11 +11,11 @@
 		ELSE
 		ELSE
 			'false'
 			'false'
 		END
 		END
-		) as isOpen from dept
+		) as isOpen from sys_dept
 	</select>
 	</select>
 
 
 	<select id="list" resultType="map">
 	<select id="list" resultType="map">
-		select * from dept
+		select * from sys_dept
 		<if test="condition != null and condition != ''">
 		<if test="condition != null and condition != ''">
 			where simplename like CONCAT('%',#{condition},'%') or fullname like CONCAT('%',#{condition},'%')
 			where simplename like CONCAT('%',#{condition},'%') or fullname like CONCAT('%',#{condition},'%')
 		</if>
 		</if>

guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMgrDao.xml

@@ -27,7 +27,7 @@
 			or name like CONCAT('%',#{name},'%'))
 			or name like CONCAT('%',#{name},'%'))
 		</if>
 		</if>
 		<if test="deptid != null and deptid != 0">
 		<if test="deptid != null and deptid != 0">
-			and (deptid = #{deptid} or deptid in ( select id from dept where pids like CONCAT('%[', #{deptid}, ']%') ))
+			and (deptid = #{deptid} or deptid in ( select id from sys_dept where pids like CONCAT('%[', #{deptid}, ']%') ))
 		</if>
 		</if>
 		<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
 		<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
 			and (createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
 			and (createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))