From 5ef91f20d4e0f9c3a2838719220fbb2c9d63fad0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 26 六月 2025 13:43:04 +0800
Subject: [PATCH] art: 启动报错问题解决

---
 src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java    |  116 +++++++++++++++++++++-----------------
 src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml |   10 ---
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
index 42e2ea2..a1a34e0 100644
--- a/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
+++ b/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
@@ -4,8 +4,6 @@
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.system.vo.SelectTreeModel;
 import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.model.SysDepartTreeModel;
-import org.jeecg.modules.system.model.TreeModel;
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
@@ -14,85 +12,97 @@
  * <p>
  * 閮ㄩ棬 Mapper 鎺ュ彛
  * <p>
- * 
+ *
  * @Author: Steve
- * @Since锛�   2019-01-22
+ * @Since锛� 2019-01-22
  */
 public interface SysDepartMapper extends BaseMapper<SysDepart> {
-	
-	/**
-	 * 鏍规嵁鐢ㄦ埛ID鏌ヨ閮ㄩ棬闆嗗悎
+
+    /**
+     * 鏍规嵁鐢ㄦ埛ID鏌ヨ閮ㄩ棬闆嗗悎
+     *
      * @param userId 鐢ㄦ埛id
      * @return List<SysDepart>
-	 */
-	public List<SysDepart> queryUserDeparts(@Param("userId") String userId);
+     */
+    public List<SysDepart> queryUserDeparts(@Param("userId") String userId);
 
-	/**
-	 * 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈤儴闂�
-	 *
-	 * @param username
-	 * @return
-	 */
-	public List<SysDepart> queryDepartsByUsername(@Param("username") String username);
+    /**
+     * 鏍规嵁鐢ㄦ埛鍚嶆煡璇㈤儴闂�
+     *
+     * @param username
+     * @return
+     */
+    public List<SysDepart> queryDepartsByUsername(@Param("username") String username);
 
     /**
      * 閫氳繃閮ㄩ棬缂栫爜鑾峰彇閮ㄩ棬id
+     *
      * @param orgCode 閮ㄩ棬缂栫爜
      * @return String
      */
-	@Select("select id from sys_depart where org_code=#{orgCode}")
-	public String queryDepartIdByOrgCode(@Param("orgCode") String orgCode);
+    @Select("select id from sys_depart where org_code=#{orgCode}")
+    public String queryDepartIdByOrgCode(@Param("orgCode") String orgCode);
 
     /**
      * 閫氳繃閮ㄩ棬id 鏌ヨ閮ㄩ棬id,鐖秈d
+     *
      * @param departId 閮ㄩ棬id
      * @return
      */
-	@Select("select id,parent_id from sys_depart where id=#{departId}")
-	public SysDepart getParentDepartId(@Param("departId") String departId);
+    @Select("select id,parent_id from sys_depart where id=#{departId}")
+    public SysDepart getParentDepartId(@Param("departId") String departId);
 
-	/**
-	 *  鏍规嵁閮ㄩ棬Id鏌ヨ,褰撳墠鍜屼笅绾ф墍鏈夐儴闂↖DS
-	 * @param departId
-	 * @return
-	 */
-	List<String> getSubDepIdsByDepId(@Param("departId") String departId);
+    /**
+     * 鏍规嵁閮ㄩ棬Id鏌ヨ,褰撳墠鍜屼笅绾ф墍鏈夐儴闂↖DS
+     *
+     * @param departId
+     * @return
+     */
+    List<String> getSubDepIdsByDepId(@Param("departId") String departId);
 
-	/**
-	 * 鏍规嵁閮ㄩ棬缂栫爜鑾峰彇閮ㄩ棬涓嬫墍鏈塈DS
-	 * @param orgCodes
-	 * @return
-	 */
-	List<String> getSubDepIdsByOrgCodes(@org.apache.ibatis.annotations.Param("orgCodes") String[] orgCodes);
+    /**
+     * 鏍规嵁閮ㄩ棬缂栫爜鑾峰彇閮ㄩ棬涓嬫墍鏈塈DS
+     *
+     * @param orgCodes
+     * @return
+     */
+    List<String> getSubDepIdsByOrgCodes(@org.apache.ibatis.annotations.Param("orgCodes") String[] orgCodes);
 
     /**
      * 鏍规嵁parent_id鏌ヨ涓嬬骇閮ㄩ棬
+     *
      * @param parentId 鐖秈d
      * @return List<SysDepart>
      */
     List<SysDepart> queryTreeListByPid(@Param("parentId") String parentId);
-	/**
-	 * 鏍规嵁id涓嬬骇閮ㄩ棬鏁伴噺
-	 * @param parentId
-	 * @return
-	 */
-	@Select("SELECT count(*) FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
-    Integer queryCountByPid(@Param("parentId")String parentId);
-	/**
-	 * 鏍规嵁OrgCod鏌ヨ鎵�灞炲叕鍙镐俊鎭�
-	 * @param orgCode
-	 * @return
-	 */
-	SysDepart queryCompByOrgCode(@Param("orgCode")String orgCode);
-	/**
-	 * 鏍规嵁id涓嬬骇閮ㄩ棬
-	 * @param parentId
-	 * @return
-	 */
-	@Select("SELECT * FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
-	List<SysDepart> queryDeptByPid(@Param("parentId")String parentId);
+
+    /**
+     * 鏍规嵁id涓嬬骇閮ㄩ棬鏁伴噺
+     *
+     * @param parentId
+     * @return
+     */
+    @Select("SELECT count(*) FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
+    Integer queryCountByPid(@Param("parentId") String parentId);
+
+    /**
+     * 鏍规嵁OrgCod鏌ヨ鎵�灞炲叕鍙镐俊鎭�
+     *
+     * @param orgCode
+     * @return
+     */
+    SysDepart queryCompByOrgCode(@Param("orgCode") String orgCode);
+
+    /**
+     * 鏍规嵁id涓嬬骇閮ㄩ棬
+     *
+     * @param parentId
+     * @return
+     */
+    @Select("SELECT * FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
+    List<SysDepart> queryDeptByPid(@Param("parentId") String parentId);
 
     List<SysDepart> getDepartListByParentId(List<String> parentIds);
 
-	List<SelectTreeModel> getDepartTreeByParentId(String parentId);
+    List<SelectTreeModel> getDepartTreeByParentId(String parentId);
 }
diff --git a/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
index 40e5d7e..866df2f 100644
--- a/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
+++ b/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
@@ -72,14 +72,4 @@
         </foreach>
         and del_flag='0'
     </select>
-
-    <select id="getDepartTreeByParentId" parameterType="String" resultType="org.jeecg.common.system.vo.SelectTreeModel">
-        select
-            id as "key",
-            depart_name as "title",
-            parent_id as parentId
-        from sys_depart
-        where parent_id = #{parentId}
-          and del_flag='0'
-    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3