Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java

@@ -132,6 +132,15 @@ public class SysUserController extends CyPaginationController<SysUser> {
                 sysUserServiceImpl.findAllByData(sysUser));
     }
 
+    //查询部门
+    @GetMapping(value = "/queryDept")
+    public CyResult queryDept(SysUser sysUser) {
+        return CyResultGenUtil.builder(new CyPersistModel(1),
+                CyMessCons.MESSAGE_ALERT_SUCCESS,
+                CyMessCons.MESSAGE_ALERT_ERROR,
+                sysUserServiceImpl.findAllByDept(sysUser));
+    }
+
     @CyOpeLogAnno(title = "system-用户表管理-查询用户表", businessType = CyLogTypeEnum.EXPORT)
     @ApiOperation(value = "导出用户表信息", notes = "导出用户表信息")
     @GetMapping(value = "/export")

src/main/java/org/rcisoft/sys/sysuser/dao/SysDeptRepositorys.java

+package org.rcisoft.sys.sysuser.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.rcisoft.core.mapper.CyBaseMapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+import org.rcisoft.sys.sysuser.entity.SysDept;
+import org.rcisoft.sys.sysuser.entity.SysUser;
+import org.springframework.stereotype.Repository;
+import org.rcisoft.core.model.CyPageInfo;
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+/**
+* Created with cy on 2022年11月18日 上午9:03:23.
+*/
+@Mapper
+public interface SysDeptRepositorys extends CyBaseMapper<SysDept> {
+
+
+    List<SysDept> querySysDepts(@Param("entity") SysDept sysDept);
+
+    /**
+    * 分页查询 sysDept
+    *
+    */
+    IPage<SysDept> querySysDeptsPaged(CyPageInfo cyPageInfo,@Param("entity") SysDept sysDept);
+
+    //查询部门
+    List<SysUser> queryDept(SysUser sysUser);
+}
+

src/main/java/org/rcisoft/sys/sysuser/dao/SysDictDataRepository.java → src/main/java/org/rcisoft/sys/sysuser/dao/SysDictDataRepositorys.java

 package org.rcisoft.sys.sysuser.dao;
 
+import org.apache.ibatis.annotations.Mapper;
 import org.rcisoft.core.mapper.CyBaseMapper;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 import org.rcisoft.sys.sysuser.entity.SysDictData;
+import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.springframework.stereotype.Repository;
 import org.rcisoft.core.model.CyPageInfo;
 import org.apache.ibatis.annotations.Param;
@@ -14,8 +16,8 @@ import java.util.List;
 /**
 * Created with cy on 2022年11月17日 下午4:03:19.
 */
-
-public interface SysDictDataRepository extends CyBaseMapper<SysDictData> {
+@Mapper
+public interface SysDictDataRepositorys extends CyBaseMapper<SysDictData> {
 
 
     List<SysDictData> querySysDictDatas(@Param("entity") SysDictData sysDictData);
@@ -25,5 +27,8 @@ public interface SysDictDataRepository extends CyBaseMapper<SysDictData> {
     *
     */
     IPage<SysDictData> querySysDictDatasPaged(CyPageInfo cyPageInfo,@Param("entity") SysDictData sysDictData);
+
+    //查询字典
+    List<SysUser> queryData(SysUser sysUser);
 }
 

src/main/java/org/rcisoft/sys/sysuser/dao/SysUserRepositorys.java

@@ -34,7 +34,8 @@ public interface SysUserRepositorys extends CyBaseMapper<SysUser> {
      */
     IPage<SysUser> querySysUsersPaged(CyPageInfo cyPageInfo, @Param("entity") SysUser sysUser);
 
-    //查询字典
-    List<SysUser> queryData(SysUser sysUser);
+
+
+
 }
 

src/main/java/org/rcisoft/sys/sysuser/entity/SysDept.java

+package org.rcisoft.sys.sysuser.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import org.rcisoft.core.entity.CyIdIncreEntity;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+* Created with cy on 2022年11月18日 上午9:03:23.
+*/
+@Data
+@TableName("sys_dept")
+public class SysDept  extends CyIdIncreEntity<SysDept> {
+
+
+     /**
+     * @desc 父部门id
+     * @column parent_id
+     * @default 
+     */
+     @Excel(name = "父部门id", orderNum = "0", width = 20)
+     private BigInteger parentId;
+
+     /**
+     * @desc 祖级列表
+     * @column ancestors
+     * @default 
+     */
+     @Excel(name = "祖级列表", orderNum = "1", width = 20)
+     private String ancestors;
+
+     /**
+     * @desc 部门名称
+     * @column dept_name
+     * @default 
+     */
+     @Excel(name = "部门名称", orderNum = "2", width = 20)
+     private String deptName;
+
+     /**
+     * @desc 显示顺序
+     * @column order_num
+     * @default 
+     */
+     @Excel(name = "显示顺序", orderNum = "3", width = 20)
+     private Integer orderNum;
+
+     /**
+     * @desc 负责人
+     * @column leader
+     * @default 
+     */
+     @Excel(name = "负责人", orderNum = "4", width = 20)
+     private String leader;
+
+     /**
+     * @desc 联系电话
+     * @column phone
+     * @default 
+     */
+     @Excel(name = "联系电话", orderNum = "5", width = 20)
+     private String phone;
+
+     /**
+     * @desc 邮箱
+     * @column email
+     * @default 
+     */
+     @Excel(name = "邮箱", orderNum = "6", width = 20)
+     private String email;
+
+     /**
+     * @desc 部门编号
+     * @column dept_code
+     * @default 
+     */
+     @Excel(name = "部门编号", orderNum = "7", width = 20)
+     private String deptCode;
+
+
+}
+

src/main/java/org/rcisoft/sys/sysuser/service/SysUserService.java

@@ -65,8 +65,12 @@ public interface SysUserService {
     */
     List<SysUser> findAll(SysUser sysUser);
 
-
+    //查询字典
     List<SysUser> findAllByData(SysUser sysUser);
+
+    //查询部门
+    List<SysUser> findAllByDept(SysUser sysUser);
+
     /**
     * 导出用户表
     * @return

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.model.CyPersistModel;
 
+import org.rcisoft.sys.sysuser.dao.SysDeptRepositorys;
+import org.rcisoft.sys.sysuser.dao.SysDictDataRepositorys;
 import org.rcisoft.sys.sysuser.dao.SysUserRepositorys;
+import org.rcisoft.sys.sysuser.entity.SysDictData;
 import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.rcisoft.sys.sysuser.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +31,10 @@ import lombok.extern.slf4j.Slf4j;
 public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser> implements SysUserService {
     @Autowired
     private SysUserRepositorys sysUserRepositorys;
-
+    @Autowired
+    private SysDeptRepositorys sysDeptRepositorys;
+    @Autowired
+    private SysDictDataRepositorys sysDictDataRepositorys;
 
     /**
      * 保存 用户表
@@ -129,7 +135,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
     }
 
     public List<SysUser> findAllByData(SysUser sysUser) {
-        return baseMapper.queryData(sysUser);
+        return sysDictDataRepositorys.queryData(sysUser);
+
+    }
+
+    public List<SysUser> findAllByDept(SysUser sysUser) {
+        return sysDeptRepositorys.queryDept(sysUser);
 
     }
 

src/main/resources/mapper/SysDeptRepositorys.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.rcisoft.sys.sysuser.dao.SysDeptRepositorys">
+    <resultMap id="BaseResultMap" type="org.rcisoft.sys.sysuser.entity.SysDept">
+        <id column="business_id" jdbcType="BIGINT" property="businessId"/>
+
+        <result column="parent_id" jdbcType="BIGINT" property="parentId"/>
+        <result column="ancestors" jdbcType="VARCHAR" property="ancestors"/>
+        <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
+        <result column="order_num" jdbcType="INTEGER" property="orderNum"/>
+        <result column="leader" jdbcType="VARCHAR" property="leader"/>
+        <result column="phone" jdbcType="VARCHAR" property="phone"/>
+        <result column="email" jdbcType="VARCHAR" property="email"/>
+        <result column="flag" jdbcType="CHAR" property="flag"/>
+        <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+        <result column="dept_code" jdbcType="VARCHAR" property="deptCode"/>
+    </resultMap>
+
+    <!--<cache type="${corePackag!}.util.RedisCache"/>-->
+    <select id="querySysDepts" resultMap="BaseResultMap">
+        select * from sys_dept
+        where 1=1
+            <if test="entity.delFlag !=null and entity.delFlag != '' ">
+                and del_flag = #{entity.delFlag}
+            </if>
+            <if test="entity.flag !=null and entity.flag != '' ">
+                and flag = #{entity.flag}
+            </if>
+    </select>
+
+    <select id="querySysDeptsPaged" resultMap="BaseResultMap">
+        select * from sys_dept
+        where 1=1
+            <if test="entity.delFlag !=null and entity.delFlag != '' ">
+                and del_flag = #{entity.delFlag}
+            </if>
+            <if test="entity.flag !=null and entity.flag != '' ">
+                and flag = #{entity.flag}
+            </if>
+    </select>
+
+    <select id="queryDept" resultMap="BaseResultMap">
+        SELECT *
+        FROM sys_dept
+        WHERE del_flag = 0
+    </select>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/SysDictDataMapper.xml → src/main/resources/mapper/SysDictDataRepositorys.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.rcisoft.sys.sysuser.dao.SysDictDataRepository">
+<mapper namespace="org.rcisoft.sys.sysuser.dao.SysDictDataRepositorys">
     <resultMap id="BaseResultMap" type="org.rcisoft.sys.sysuser.entity.SysDictData">
         <id column="business_id" jdbcType="BIGINT" property="businessId"/>
 
@@ -42,4 +42,12 @@
                 and flag = #{entity.flag}
             </if>
     </select>
+
+
+    <select id="queryData" resultMap="BaseResultMap">
+        SELECT *
+        FROM sys_dict_data
+        WHERE dict_type = #{dictType}
+          and del_flag = 0
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/SysUserRepositorys.xml

@@ -76,10 +76,10 @@
         <if test="entity.phone !=null and entity.phone != '' ">
             and phone = #{entity.phone}
         </if>
-        <if test="entity.beginTime != null"><!-- 开始时间检索 -->
+        <if test="entity.beginTime != null and entity.beginTime !='' "><!-- 开始时间检索 -->
             and date_format(create_date,'%Y-%m-%d') &gt;= date_format(#{entity.beginTime},'%Y-%m-%d')
         </if>
-        <if test="entity.endTime != null"><!-- 结束时间检索 -->
+        <if test="entity.endTime != null and entity.endTime !='' "><!-- 结束时间检索 -->
             and date_format(create_date,'%Y-%m-%d') &lt;= date_format(#{entity.endTime},'%Y-%m-%d')
         </if>
         <if test="entity.px == 1 "><!-- 排序-->
@@ -158,11 +158,5 @@
           and business_id = #{businessId}
     </select>
 
-    <select id="queryData" resultMap="BaseResultMap">
-        SELECT *
-        FROM sys_dict_data
-        WHERE dict_type = #{dictType}
-          and del_flag = 0
-    </select>
 
 </mapper>