Merge remote-tracking branch 'origin/master'

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/OfficeApiFallbackFactory.java

@@ -52,6 +52,11 @@ public class OfficeApiFallbackFactory implements FallbackFactory <IOfficeApi> {
             public List<Office> selectListByIsPublic(String isPublic) {
                 return null;
             }
+
+            @Override
+            public OfficeDTO getParentOfficeById(String id) {
+                return null;
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IOfficeApi.java

@@ -58,4 +58,12 @@ public interface IOfficeApi {
      */
     @GetMapping(value = "/feign/sys/office/selectListByIsPublic")
     List<Office> selectListByIsPublic(@RequestParam(value = "isPublic")String isPublic);
+
+    /**
+     * 根据id 查询父级部门信息
+     *
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/office/getParentOfficeById")
+    OfficeDTO getParentOfficeById(@RequestParam(value = "id") String id);
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/OfficeApiImpl.java

@@ -45,4 +45,9 @@ public class OfficeApiImpl implements IOfficeApi {
     public List<Office> selectListByIsPublic(String isPublic) {
         return officeService.selectListByIsPublic(isPublic);
     }
+
+    @Override
+    public OfficeDTO getParentOfficeById(String id) {
+        return officeService.getParentOfficeById(id);
+    }
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/OfficeMapper.java

@@ -119,4 +119,12 @@ public interface OfficeMapper extends TreeMapper <Office> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<Office> getChild(@Param("rootId")String rootId);
+
+    /**
+     * 根据id查询父级office信息
+     * @param id
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    OfficeDTO getParentOfficeById(String id);
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/OfficeMapper.xml

@@ -365,4 +365,14 @@
             del_flag = 0
             and parent_id = #{rootId}
     </select>
+
+    <select id="getParentOfficeById" resultType="com.jeeplus.sys.service.dto.OfficeDTO">
+        select
+        <include refid="officeColumns"/>
+        from sys_office a
+        <where>
+            a.id = (select parent_id from sys_office where id = #{id})
+            and a.del_flag = 0
+        </where>
+    </select>
 </mapper>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -348,6 +348,10 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
         return baseMapper.getOfficeById(id);
     }
 
+    public OfficeDTO getParentOfficeById(String id){
+        return baseMapper.getParentOfficeById(id);
+    }
+
     public List<String> getOfficeNameByIds(List<String> idList){
         return baseMapper.getOfficeNameByIds(idList);
     }