教育培训代码迁移

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -20,9 +20,12 @@ public interface RemoteOrgService {
      * @return 结果
      */
     @GetMapping("/org/list/nopage")
-    public R<List<SysOrg>> getAllOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<List<SysOrg>> getAllOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/org/sync/batch")
-    public R<Boolean> batchSaveSyncOrg(@RequestBody List<SysOrg> orgList, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<Boolean> batchSaveSyncOrg(@RequestBody List<SysOrg> orgList, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    @GetMapping("/org/{orgId}")
+    SysOrg selectSysOrgById(@PathVariable("orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -40,6 +40,9 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
                 return null;
             }
 
+            @Override
+            public SysOrg selectSysOrgById(Long orgId, String source) {return null;}
+
 
         };
     }

soc-api/soc-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,4 @@
 com.xunmei.system.api.factory.RemoteUserFallbackFactory
 com.xunmei.system.api.factory.RemoteLogFallbackFactory
 com.xunmei.system.api.factory.RemoteFileFallbackFactory
+com.xunmei.system.api.factory.RemoteOrgFallbackFactory

soc-auth/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 10.87.10.54:8848
-        namespace: 083dc0cf-7829-4914-9d5c-d48f1a31015d
+        namespace: 598294c7-43c1-4d78-a437-21669f936cbb
       config:
         # 配置中心地址
         server-addr: 10.87.10.54:8848
@@ -24,7 +24,7 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-        namespace: 083dc0cf-7829-4914-9d5c-d48f1a31015d
+        namespace: 598294c7-43c1-4d78-a437-21669f936cbb
 logging:
   file:
     name: logs/${spring.application.name}/info.log

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/SocCoreApplication.java

@@ -1,7 +1,22 @@
 package com.xunmei.core;
 
+
+import com.xunmei.common.security.annotation.EnableCustomConfig;
+import com.xunmei.common.security.annotation.EnableSocFeignClients;
+import com.xunmei.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.annotation.MapperScans;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@MapperScan("com.xunmei.core.**.mapper")
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableSocFeignClients
+@SpringBootApplication
 public class SocCoreApplication {
     public static void main(String[] args) {
-        System.out.println("Hello world!");
+        SpringApplication.run(SocCoreApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  core模块启动成功   ლ(´ڡ`ლ)ﾞ  ");
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysKnowledgeController.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/SysKnowledgeController.java

@@ -1,10 +1,9 @@
-package com.xunmei.system.controller;
+package com.xunmei.core.edu.controller;
 
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 import com.xunmei.common.core.domain.IdName;
+import com.xunmei.core.edu.domain.SysKnowledge;
+import com.xunmei.core.edu.service.ISysKnowledgeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,13 +16,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.system.domain.SysKnowledge;
-import com.xunmei.system.service.ISysKnowledgeService;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysLearningMaterialsController.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/SysLearningMaterialsController.java

@@ -1,10 +1,8 @@
-package com.xunmei.system.controller;
+package com.xunmei.core.edu.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.xunmei.system.dto.SysLearningMaterialsPageDto;
+import com.xunmei.core.edu.domain.SysLearningMaterials;
+import com.xunmei.core.edu.dto.SysLearningMaterialsPageDto;
+import com.xunmei.core.edu.service.ISysLearningMaterialsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,13 +15,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.system.domain.SysLearningMaterials;
-import com.xunmei.system.service.ISysLearningMaterialsService;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysKnowledge.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/domain/SysKnowledge.java

@@ -1,4 +1,4 @@
-package com.xunmei.system.domain;
+package com.xunmei.core.edu.domain;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysLearningMaterials.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/domain/SysLearningMaterials.java

@@ -1,4 +1,4 @@
-package com.xunmei.system.domain;
+package com.xunmei.core.edu.domain;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysLearningMaterialsPageDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/dto/SysLearningMaterialsPageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.system.dto;
+package com.xunmei.core.edu.dto;
 
 import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/vo/SysLearningMaterialsPageVo.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/dto/SysLearningMaterialsPageVo.java

@@ -1,4 +1,4 @@
-package com.xunmei.system.domain.vo;
+package com.xunmei.core.edu.dto;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysKnowledgeMapper.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/SysKnowledgeMapper.java

@@ -1,9 +1,10 @@
-package com.xunmei.system.mapper;
+package com.xunmei.core.edu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.edu.domain.SysKnowledge;
 
 import java.util.List;
 
-import com.xunmei.system.domain.SysKnowledge;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * 知识库标签Mapper接口

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysLearningMaterialsMapper.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/SysLearningMaterialsMapper.java

@@ -1,12 +1,11 @@
-package com.xunmei.system.mapper;
+package com.xunmei.core.edu.mapper;
 
 import java.util.List;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.system.domain.SysLearningMaterials;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.system.domain.vo.SysLearningMaterialsPageVo;
-import com.xunmei.system.dto.SysLearningMaterialsPageDto;
+import com.xunmei.core.edu.domain.SysLearningMaterials;
+import com.xunmei.core.edu.dto.SysLearningMaterialsPageDto;
+import com.xunmei.core.edu.dto.SysLearningMaterialsPageVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysKnowledgeService.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ISysKnowledgeService.java

@@ -1,12 +1,11 @@
-package com.xunmei.system.service;
+package com.xunmei.core.edu.service;
 
 import java.util.List;
 
-import com.xunmei.common.core.domain.IdName;
-import com.xunmei.system.domain.SysKnowledge;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.domain.IdName;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.edu.domain.SysKnowledge;
 
 /**
  * 知识库标签Service接口

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysLearningMaterialsService.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ISysLearningMaterialsService.java

@@ -1,12 +1,11 @@
-package com.xunmei.system.service;
+package com.xunmei.core.edu.service;
 
 import java.util.List;
 
-import com.xunmei.system.domain.SysLearningMaterials;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.dto.SysLearningMaterialsPageDto;
+import com.xunmei.core.edu.domain.SysLearningMaterials;
+import com.xunmei.core.edu.dto.SysLearningMaterialsPageDto;
 
 /**
  * 学习资料Service接口

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysKnowledgeServiceImpl.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysKnowledgeServiceImpl.java

@@ -1,27 +1,23 @@
-package com.xunmei.system.service.impl;
+package com.xunmei.core.edu.service.impl;
 
 import java.util.Collections;
 import java.util.List;
-
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.IdName;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.core.edu.domain.SysKnowledge;
+import com.xunmei.core.edu.mapper.SysKnowledgeMapper;
+import com.xunmei.core.edu.service.ISysKnowledgeService;
+import com.xunmei.system.api.RemoteOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
-
 import java.util.Arrays;
 import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysKnowledgeMapper;
-import com.xunmei.system.domain.SysKnowledge;
-import com.xunmei.system.service.ISysKnowledgeService;
 
 /**
  * 知识库标签Service业务层处理
@@ -34,7 +30,7 @@ public class SysKnowledgeServiceImpl extends ServiceImpl<SysKnowledgeMapper, Sys
     @Autowired
     private SysKnowledgeMapper sysKnowledgeMapper;
     @Autowired
-    private ISysOrgService orgService;
+    private RemoteOrgService orgService;
 
     @Override
     public TableDataInfo selectPage(SysKnowledge sysKnowledge) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysLearningMaterialsServiceImpl.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysLearningMaterialsServiceImpl.java

@@ -1,29 +1,30 @@
-package com.xunmei.system.service.impl;
+package com.xunmei.core.edu.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.constant.ServiceNameConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.edu.domain.SysLearningMaterials;
+import com.xunmei.core.edu.dto.SysLearningMaterialsPageDto;
+import com.xunmei.core.edu.dto.SysLearningMaterialsPageVo;
+import com.xunmei.core.edu.mapper.SysLearningMaterialsMapper;
+import com.xunmei.core.edu.service.ISysLearningMaterialsService;
+import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.domain.vo.SysLearningMaterialsPageVo;
-import com.xunmei.system.dto.SysLearningMaterialsPageDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
 
 import java.util.Arrays;
 import java.util.stream.Stream;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.SysLearningMaterialsMapper;
-import com.xunmei.system.domain.SysLearningMaterials;
-import com.xunmei.system.service.ISysLearningMaterialsService;
 
 /**
  * 学习资料Service业务层处理
@@ -36,7 +37,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
     @Autowired
     private SysLearningMaterialsMapper sysLearningMaterialsMapper;
     @Autowired
-    private ISysOrgService orgService;
+    private RemoteOrgService remoteOrgService;
 
     @Override
     public TableDataInfo selectPage(SysLearningMaterialsPageDto sysLearningMaterials) {
@@ -60,7 +61,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
     }
 
     private void dealParentOrgId(SysLearningMaterialsPageDto sysLearningMaterials) {
-        SysOrg sysOrg = orgService.selectSysOrgById(sysLearningMaterials.getOrgId());
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
         if (sysOrg == null || ObjectUtil.isEmpty(sysOrg.getPath())) {
             return;
         }
@@ -106,7 +107,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         sysLearningMaterials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         sysLearningMaterials.setUpdateTime(DateUtils.getNowDate());
         sysLearningMaterials.setIsOpen(0);
-        final SysOrg sysOrg = orgService.selectSysOrgById(sysLearningMaterials.getOrgId());
+        final SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
         if (sysOrg != null) {
             sysLearningMaterials.setOrgName(sysOrg.getName());
             sysLearningMaterials.setOrgPath(sysOrg.getPath());

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysKnowledgeMapper.xml → soc-modules/soc-modules-core/src/main/resources/mapper/edu/SysKnowledgeMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.SysKnowledgeMapper">
+<mapper namespace="com.xunmei.core.edu.mapper.SysKnowledgeMapper">
 
-    <resultMap type="com.xunmei.system.domain.SysKnowledge" id="SysKnowledgeResult">
+    <resultMap type="com.xunmei.core.edu.domain.SysKnowledge" id="SysKnowledgeResult">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="createBy" column="create_by"/>
@@ -19,7 +19,7 @@
         from sys_knowledge
     </sql>
 
-    <select id="selectSysKnowledgeList" parameterType="com.xunmei.system.domain.SysKnowledge"
+    <select id="selectSysKnowledgeList" parameterType="com.xunmei.core.edu.domain.SysKnowledge"
             resultMap="SysKnowledgeResult">
         <include refid="selectSysKnowledgeVo"/>
         <where>
@@ -37,13 +37,13 @@
         <include refid="selectSysKnowledgeVo"/>
         where id = #{id}
     </select>
-    <select id="dataList" resultType="com.xunmei.system.domain.SysKnowledge">
+    <select id="dataList" resultType="com.xunmei.core.edu.domain.SysKnowledge">
         select id as id, `name` as name
         from sys_knowledge
         where deleted = 0
     </select>
 
-    <insert id="insertSysKnowledge" parameterType="com.xunmei.system.domain.SysKnowledge" useGeneratedKeys="true"
+    <insert id="insertSysKnowledge" parameterType="com.xunmei.core.edu.domain.SysKnowledge" useGeneratedKeys="true"
             keyProperty="id">
         insert into sys_knowledge
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -76,7 +76,7 @@
         </trim>
     </insert>
 
-    <update id="updateSysKnowledge" parameterType="com.xunmei.system.domain.SysKnowledge">
+    <update id="updateSysKnowledge" parameterType="com.xunmei.core.edu.domain.SysKnowledge">
         update sys_knowledge
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null and name != ''">name =

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysLearningMaterialsMapper.xml → soc-modules/soc-modules-core/src/main/resources/mapper/edu/SysLearningMaterialsMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.SysLearningMaterialsMapper">
+<mapper namespace="com.xunmei.core.edu.mapper.SysLearningMaterialsMapper">
 
-    <resultMap type="com.xunmei.system.domain.SysLearningMaterials" id="SysLearningMaterialsResult">
+    <resultMap type="com.xunmei.core.edu.domain.SysLearningMaterials" id="SysLearningMaterialsResult">
         <result property="id" column="id"/>
         <result property="title" column="title"/>
         <result property="content" column="content"/>
@@ -49,7 +49,7 @@
         </if>
     </sql>
 
-    <select id="selectSysLearningMaterialsList" parameterType="com.xunmei.system.domain.SysLearningMaterials"
+    <select id="selectSysLearningMaterialsList" parameterType="com.xunmei.core.edu.domain.SysLearningMaterials"
             resultMap="SysLearningMaterialsResult">
         <include refid="selectSysLearningMaterialsVo"/>
         <where>
@@ -91,7 +91,7 @@
         <include refid="selectSysLearningMaterialsVo"/>
         where id = #{id}
     </select>
-    <select id="selectPageData" resultType="com.xunmei.system.domain.vo.SysLearningMaterialsPageVo">
+    <select id="selectPageData" resultType="com.xunmei.core.edu.dto.SysLearningMaterialsPageVo">
         select m.id,
         title,
         k.name as knowledgeName,
@@ -132,7 +132,7 @@
         order by m.org_id, m.create_time desc
     </select>
 
-    <insert id="insertSysLearningMaterials" parameterType="com.xunmei.system.domain.SysLearningMaterials">
+    <insert id="insertSysLearningMaterials" parameterType="com.xunmei.core.edu.domain.SysLearningMaterials">
         insert into sys_learning_materials
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,
@@ -200,7 +200,7 @@
         </trim>
     </insert>
 
-    <update id="updateSysLearningMaterials" parameterType="com.xunmei.system.domain.SysLearningMaterials">
+    <update id="updateSysLearningMaterials" parameterType="com.xunmei.core.edu.domain.SysLearningMaterials">
         update sys_learning_materials
         <trim prefix="SET" suffixOverrides=",">
             <if test="title != null">title =

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -24,25 +24,25 @@ import java.util.List;
  * @author xunmei
  * @date 2023-08-10
  */
-@Api(tags = {"SysOrg" })
+@Api(tags = {"SysOrg"})
 @RestController
 @RequestMapping("/org")
 public class SysOrgController extends BaseController {
     @Autowired
     private ISysOrgService sysOrgService;
 
-/**
- * 查询【请填写功能名称】列表
- */
-@ApiOperation(value = "查询SysOrg列表")
-@RequiresPermissions("system:org:list")
-@GetMapping("/list")
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @ApiOperation(value = "查询SysOrg列表")
+    @RequiresPermissions("system:org:list")
+    @GetMapping("/list")
     public TableDataInfo list(SysOrg sysOrg) {
 
-        return sysOrgService.selectPage( sysOrg);
+        return sysOrgService.selectPage(sysOrg);
     }
 
-                                                
+
     /**
      * 获取【请填写功能名称】详细信息
      */
@@ -58,7 +58,7 @@ public class SysOrgController extends BaseController {
      */
     @ApiOperation(value = "新增SysOrg")
     @RequiresPermissions("system:org:add")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.INSERT)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysOrg sysOrg) {
         return toAjax(sysOrgService.insertSysOrg(sysOrg));
@@ -69,7 +69,7 @@ public class SysOrgController extends BaseController {
      */
     @ApiOperation(value = "修改SysOrg")
     @RequiresPermissions("system:org:edit")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.UPDATE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody SysOrg sysOrg) {
         return toAjax(sysOrgService.updateSysOrg(sysOrg));
@@ -80,7 +80,7 @@ public class SysOrgController extends BaseController {
      */
     @ApiOperation(value = "删除SysOrg")
     @RequiresPermissions("system:org:remove")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(sysOrgService.deleteSysOrgByIds(ids));
@@ -105,4 +105,14 @@ public class SysOrgController extends BaseController {
     public R<Boolean> batchSaveSyncSysOrgs(@RequestBody List<SysOrg> sysOrgList) {
         return R.ok(sysOrgService.saveOrUpdateBatch(sysOrgList));
     }
+
+    /**
+     * 查询机构列表
+     */
+    @ApiOperation(value = "获取单个机构信息")
+    @InnerAuth
+    @GetMapping("/{orgId}")
+    public SysOrg selectSysOrgById(@PathVariable("orgId") Long orgId) {
+        return sysOrgService.getById(orgId);
+    }
 }