From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java |  108 ++++++++----------------------------------------------
 1 files changed, 16 insertions(+), 92 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
index 2a6a46f..051085c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
@@ -1,117 +1,41 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 閮ㄩ棬绠$悊 鏁版嵁灞�
- * 
- * @author ruoyi
+ *
+ * @author Lion Li
  */
-public interface SysDeptMapper
-{
+public interface SysDeptMapper extends BaseMapperPlus<SysDept> {
+
     /**
      * 鏌ヨ閮ㄩ棬绠$悊鏁版嵁
-     * 
+     *
      * @param dept 閮ㄩ棬淇℃伅
      * @return 閮ㄩ棬淇℃伅闆嗗悎
      */
-    public List<SysDept> selectDeptList(SysDept dept);
+    List<SysDept> selectDeptList(SysDept dept);
 
     /**
      * 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戜俊鎭�
-     * 
-     * @param roleId 瑙掕壊ID
+     *
+     * @param roleId            瑙掕壊ID
+     * @param deptCheckStrictly 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀�
      * @return 閫変腑閮ㄩ棬鍒楄〃
      */
-    public List<Integer> selectDeptListByRoleId(Long roleId);
-
-    /**
-     * 鏍规嵁閮ㄩ棬ID鏌ヨ淇℃伅
-     * 
-     * @param deptId 閮ㄩ棬ID
-     * @return 閮ㄩ棬淇℃伅
-     */
-    public SysDept selectDeptById(Long deptId);
-
-    /**
-     * 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬
-     * 
-     * @param deptId 閮ㄩ棬ID
-     * @return 閮ㄩ棬鍒楄〃
-     */
-    public List<SysDept> selectChildrenDeptById(Long deptId);
-
-    /**
-     * 鏍规嵁ID鏌ヨ鎵�鏈夊瓙閮ㄩ棬锛堟甯哥姸鎬侊級
-     * 
-     * @param deptId 閮ㄩ棬ID
-     * @return 瀛愰儴闂ㄦ暟
-     */
-    public int selectNormalChildrenDeptById(Long deptId);
-
-    /**
-     * 鏄惁瀛樺湪瀛愯妭鐐�
-     * 
-     * @param deptId 閮ㄩ棬ID
-     * @return 缁撴灉
-     */
-    public int hasChildByDeptId(Long deptId);
-
-    /**
-     * 鏌ヨ閮ㄩ棬鏄惁瀛樺湪鐢ㄦ埛
-     * 
-     * @param deptId 閮ㄩ棬ID
-     * @return 缁撴灉
-     */
-    public int checkDeptExistUser(Long deptId);
-
-    /**
-     * 鏍¢獙閮ㄩ棬鍚嶇О鏄惁鍞竴
-     * 
-     * @param deptName 閮ㄩ棬鍚嶇О
-     * @param parentId 鐖堕儴闂↖D
-     * @return 缁撴灉
-     */
-    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
-
-    /**
-     * 鏂板閮ㄩ棬淇℃伅
-     * 
-     * @param dept 閮ㄩ棬淇℃伅
-     * @return 缁撴灉
-     */
-    public int insertDept(SysDept dept);
-
-    /**
-     * 淇敼閮ㄩ棬淇℃伅
-     * 
-     * @param dept 閮ㄩ棬淇℃伅
-     * @return 缁撴灉
-     */
-    public int updateDept(SysDept dept);
-
-    /**
-     * 淇敼鎵�鍦ㄩ儴闂ㄧ殑鐖剁骇閮ㄩ棬鐘舵��
-     * 
-     * @param dept 閮ㄩ棬
-     */
-    public void updateDeptStatus(SysDept dept);
+    List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
     /**
      * 淇敼瀛愬厓绱犲叧绯�
-     * 
+     *
      * @param depts 瀛愬厓绱�
      * @return 缁撴灉
      */
-    public int updateDeptChildren(@Param("depts") List<SysDept> depts);
+    int updateDeptChildren(@Param("depts") List<SysDept> depts);
 
-    /**
-     * 鍒犻櫎閮ㄩ棬绠$悊淇℃伅
-     * 
-     * @param deptId 閮ㄩ棬ID
-     * @return 缁撴灉
-     */
-    public int deleteDeptById(Long deptId);
 }

--
Gitblit v1.9.3