1、部门新增2字段

.idea/workspace.xml

@@ -4,12 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、菜单接口、部门接口">
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java" afterDir="false" />
+    <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、部门列表树型结构构建">
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/entity/SysMenuSearchPO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/mapper/SysOrgMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/SysOrgService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/SysOrgService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -36,9 +39,9 @@
       </MavenGeneralSettings>
     </option>
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 7
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 7
+}</component>
   <component name="ProjectId" id="2aezaWUwbDRLzY7u1sjL3Hf0jM5" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -48,46 +51,47 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "Maven.application [clean].executor": "Run",
-    "Maven.application [org.apache.maven.plugins:maven-clean-plugin:3.1.0:clean].executor": "Run",
-    "Maven.application [package].executor": "Run",
-    "Maven.my-spring-boot-app [clean].executor": "Run",
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "Spring Boot.Application.executor": "Debug",
-    "jdk.selected.JAVA_MODULE": "1.8",
-    "kotlin-language-version-configured": "true",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "模块",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "MavenSettings",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;Maven.application [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.application [org.apache.maven.plugins:maven-clean-plugin:3.1.0:clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.application [package].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.my-spring-boot-app [clean].executor&quot;: &quot;Run&quot;,
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;Spring Boot.Application.executor&quot;: &quot;Debug&quot;,
+    &quot;jdk.selected.JAVA_MODULE&quot;: &quot;1.8&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "mongo",
-      "mysql"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;mongo&quot;,
+      &quot;mysql&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\setin\IdeaProjects\GeneralFrame\application\src\main\resources" />
       <recent name="C:\Users\setin\IdeaProjects\GeneralFrame\application\src\main\java\com\ctsi" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.ctsi.SysMenu.entity" />
       <recent name="com.ctsi.SysOrg.entity" />
       <recent name="com.ctsi.user.entity" />
       <recent name="com.ctsi.utils" />
@@ -117,7 +121,8 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1704693898384</updated>
-      <workItem from="1704693899463" duration="55166000" />
+      <workItem from="1704693899463" duration="56714000" />
+      <workItem from="1704875622703" duration="2299000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -151,7 +156,15 @@
       <option name="project" value="LOCAL" />
       <updated>1704868851272</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="1、部门列表树型结构构建">
+      <option name="closed" value="true" />
+      <created>1704874225958</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1704874225958</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -163,6 +176,7 @@
     <MESSAGE value="1、post请求用body体&#10;2、通用返回体" />
     <MESSAGE value="1、修改登录接口的userName字段&#10;2、long类型的id使用string字符串传递给前端&#10;3、优化用户相关接口&#10;4、新增用户详情表&#10;5、新增mybatis-plus-join" />
     <MESSAGE value="1、菜单接口、部门接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="1、菜单接口、部门接口" />
+    <MESSAGE value="1、部门列表树型结构构建" />
+    <option name="LAST_COMMIT_MESSAGE" value="1、部门列表树型结构构建" />
   </component>
 </project>

application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
 
- /**
+/**
  * 部门信息表;
  * @author : machaoyi
  * @date : 2024-1-10
@@ -43,6 +43,12 @@ public class SysOrg implements Serializable,Cloneable{
     /** 排序 */
     @ApiModelProperty(value = "排序",notes = "")
     private Integer orderBy ;
+    /** 部门负责人 */
+    @ApiModelProperty(value = "部门负责人",notes = "")
+    private String orgLeader ;
+    /** 联系方式 */
+    @ApiModelProperty(value = "联系方式",notes = "")
+    private String orgLeaderPhone ;
 
     /** 主键id */
     public Long getId(){
@@ -108,4 +114,20 @@ public class SysOrg implements Serializable,Cloneable{
     public void setOrderBy(Integer orderBy){
         this.orderBy=orderBy;
     }
+    /** 部门负责人 */
+    public String getOrgLeader(){
+        return this.orgLeader;
+    }
+    /** 部门负责人 */
+    public void setOrgLeader(String orgLeader){
+        this.orgLeader=orgLeader;
+    }
+    /** 联系方式 */
+    public String getOrgLeaderPhone(){
+        return this.orgLeaderPhone;
+    }
+    /** 联系方式 */
+    public void setOrgLeaderPhone(String orgLeaderPhone){
+        this.orgLeaderPhone=orgLeaderPhone;
+    }
 }

application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java

@@ -38,6 +38,12 @@ public class SysOrgSearchPO implements Serializable,Cloneable{
    /** 排序 */
     @ApiModelProperty(value = "排序",notes = "")
     private Integer orderBy ;
+   /** 部门负责人 */
+   @ApiModelProperty(value = "部门负责人",notes = "")
+   private String orgLeader ;
+   /** 联系方式 */
+   @ApiModelProperty(value = "联系方式",notes = "")
+   private String orgLeaderPhone ;
 
    /** 主键id */
    public Long getId(){
@@ -87,4 +93,20 @@ public class SysOrgSearchPO implements Serializable,Cloneable{
    public void setOrderBy(Integer orderBy) {
       this.orderBy = orderBy;
    }
+   /** 部门负责人 */
+   public String getOrgLeader(){
+      return this.orgLeader;
+   }
+   /** 部门负责人 */
+   public void setOrgLeader(String orgLeader){
+      this.orgLeader=orgLeader;
+   }
+   /** 联系方式 */
+   public String getOrgLeaderPhone(){
+      return this.orgLeaderPhone;
+   }
+   /** 联系方式 */
+   public void setOrgLeaderPhone(String orgLeaderPhone){
+      this.orgLeaderPhone=orgLeaderPhone;
+   }
 }

application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java

@@ -93,6 +93,12 @@ public class SysOrgServiceImpl implements SysOrgService{
         if(StrUtil.isNotBlank(sysOrg.getDescription())){
             chainWrapper.set(SysOrg::getDescription, sysOrg.getDescription());
         }
+        if(StrUtil.isNotBlank(sysOrg.getOrgLeader())){
+            chainWrapper.set(SysOrg::getOrgLeader, sysOrg.getOrgLeader());
+        }
+        if(StrUtil.isNotBlank(sysOrg.getOrgLeaderPhone())){
+            chainWrapper.set(SysOrg::getOrgLeaderPhone, sysOrg.getOrgLeaderPhone());
+        }
         //2. 设置主键，并更新
         chainWrapper.eq(SysOrg::getId, sysOrg.getId());
         boolean ret = chainWrapper.update();
@@ -146,13 +152,6 @@ public class SysOrgServiceImpl implements SysOrgService{
                  children.add(buildTreeRecursively(node, nodeMap, node.getId()));
              }
          });
-//         for (SysOrgSearchPO node : nodeMap.values()) {
-//             if (Objects.equals(node.getParentId(), parentId)) {
-//                 // 递归构建子节点
-//                 children.add(buildTreeRecursively(node, nodeMap, node.getId()));
-//             }
-//         }
-
          // 将子节点设置到父节点
          parentNode.setChildren(children);