履职任务获取机构名称

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

@@ -72,6 +72,12 @@ public interface RemoteOrgService {
      */
     @GetMapping("/org/getUpOrgs/{orgId}")
     List<Long> getUpOrgs(@PathVariable("orgId") Long orgId);
+
+    /**
+     *
+     * @param source
+     * @return
+     */
     @GetMapping("/org/list/findAllOrg")
     List<SysOrg> findAllOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
@@ -80,6 +86,6 @@ public interface RemoteOrgService {
      * @param ids
      * @return
      */
-    @GetMapping("/org/getParentNames")
-    List<IdNameVo> getParentName(List<Long> ids);
+    @PostMapping("/org/getParentNames")
+    R<List<IdNameVo>> getParentName(@RequestBody  List<Long> ids);
 }

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

@@ -98,8 +98,8 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
                 return new ArrayList<>();
             }
             @Override
-            public List<IdNameVo> getParentName(List<Long> ids){
-                return  new ArrayList<>();
+            public R<List<IdNameVo>> getParentName(List<Long> ids){
+                return R.ok(new ArrayList<>()) ;
             }
 
             @Override

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ResumptionRecordServiceImpl.java

@@ -223,7 +223,9 @@ public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMap
         }*/
 
 //        List<IdNameVo> planList = appPlanMapper.selectPlanNames(list.stream().map(i -> i.getPlanId()).distinct().collect(Collectors.toList()));
-        List<IdNameVo> orgNames = orgService.getParentName(list.stream().map(i -> i.getOrgId()).distinct().collect(Collectors.toList()));
+        List<IdNameVo> orgNames = orgService.getParentName(list.stream()
+                        .map(i -> i.getOrgId()).distinct().collect(Collectors.toList()))
+                .getData();
         List<IdNameVo> roleNames = roleService.getNames(RoleConditionEto
                 .builder()
                 .ids(list.stream().map(i -> i.getRoleId()).distinct().collect(Collectors.toList())).build());

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

@@ -155,7 +155,11 @@ public class SysOrgController extends BaseController {
      */
     @GetMapping("/getUpOrgs/{orgId}")
     public List<Long> getUpOrgs(@PathVariable("orgId") Long orgId) {
-        String path = sysOrgMapper.selectById(orgId).getPath();
+        SysOrg org=sysOrgMapper.selectById(orgId);
+        if(ObjectUtil.isNull(org)){
+            return  null;
+        }
+        String path = org.getPath();
         if (ObjectUtil.isEmpty(path)) {
             return new ArrayList<>();
         }
@@ -173,8 +177,8 @@ public class SysOrgController extends BaseController {
      * @param ids
      * @return
      */
-    @GetMapping("/getParentNames")
-    public List<IdNameVo> getParentName(List<Long> ids) {
-        return sysOrgMapper.getParentName(ids);
+    @PostMapping("/getParentNames")
+    public R<List<IdNameVo>> getParentName(@RequestBody List<Long> ids) {
+        return R.ok(sysOrgMapper.getParentName(ids));
     }
 }