Fix 修复获取不到组织结构列表的问题

SERVER/YanZhongXYH/xyh-admin/src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 --- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /YanZhongXYH/server/temp
+spring.servlet.multipart.location: /www/wwwroot/yzxyh/server/temp
 
 vber:
-  profile: /home/vber/YzXYH/UploadFile
+  profile: /www/wwwroot/yzxyh/server/UploadFile
   shardingSphere:
     enabled: false
     database-name: vber_logic_db

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/system/controller/system/SysOrgController.java

@@ -35,10 +35,11 @@ public class SysOrgController extends BaseController {
      */
     @GetMapping("/list")
     public R<List<SysOrg>> list(SysOrg org) {
-        List<SysOrg> orgs = orgService.selectOrgList(org);
+        List<SysOrg> orgs = orgService.selectOrgList2(org);
         return R.ok(orgs);
     }
 
+
     /**
      * 查询部门列表（排除节点）
      *

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/system/mapper/SysOrgMapper.java

@@ -30,6 +30,9 @@ public interface SysOrgMapper extends BaseMapperPlus<SysOrgMapper, SysOrg, SysOr
     })
     List<SysOrg> selectOrgList(@Param(Constants.WRAPPER) Wrapper<SysOrg> queryWrapper);
 
+    List<SysOrg> selectOrgList2(@Param(Constants.WRAPPER) Wrapper<SysOrg> queryWrapper);
+
+
     /**
      * 根据角色ID查询组织结构树信息
      *

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/system/service/ISysOrgService.java

@@ -19,6 +19,8 @@ public interface ISysOrgService {
      */
     List<SysOrg> selectOrgList(SysOrg org);
 
+    List<SysOrg> selectOrgList2(SysOrg org);
+
     /**
      * 查询组织结构树结构信息
      *

SERVER/YanZhongXYH/xyh-system/src/main/java/cn/xyh/system/service/impl/SysOrgServiceImpl.java

@@ -53,6 +53,15 @@ public class SysOrgServiceImpl implements ISysOrgService, IOrgService {
      */
     @Override
     public List<SysOrg> selectOrgList(SysOrg org) {
+        return selectOrgListByType(org, 0L);
+    }
+
+    @Override
+    public List<SysOrg> selectOrgList2(SysOrg org) {
+        return selectOrgListByType(org, 1L);
+    }
+
+    public List<SysOrg> selectOrgListByType(SysOrg org, Long type) {
         LambdaQueryWrapper<SysOrg> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysOrg::getDelFlag, "0")
                 .eq(ObjectUtil.isNotNull(org.getOrgId()), SysOrg::getOrgId, org.getOrgId())
@@ -61,7 +70,7 @@ public class SysOrgServiceImpl implements ISysOrgService, IOrgService {
                 .eq(StringUtils.isNotBlank(org.getStatus()), SysOrg::getStatus, org.getStatus())
                 .orderByAsc(SysOrg::getParentId)
                 .orderByAsc(SysOrg::getOrderNum);
-        return baseMapper.selectOrgList(lqw);
+        return type == 0 ? baseMapper.selectOrgList(lqw) : baseMapper.selectOrgList2(lqw);
     }
 
     /**

SERVER/YanZhongXYH/xyh-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -22,9 +22,13 @@
     </resultMap>
 
     <select id="selectOrgList" resultMap="SysOrgResult">
-        select * from sys_org ${ew.getCustomSqlSegment}
+        select *
+        from sys_org ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectOrgList2" resultMap="SysOrgResult">
+        select *
+        from sys_org ${ew.getCustomSqlSegment}
     </select>
-
     <select id="selectOrgListByRoleId" resultType="Long">
         select d.org_id
         from sys_org d