Merge remote-tracking branch 'origin/dev_20230210_dtd' into dev_ch_master

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -109,6 +109,16 @@ public class DisableController {
         List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList(String.valueOf(organId), srvOrganId, false);
         return Result.success(chFndSrvModes);
     }
+    /**
+     * 查询机构意向服务机构
+     *
+     * @param
+     */
+    @RequestMapping("/srvOrganList2")
+    public Result<List<ChSrvOrgan>> srvOrganList2(String organId) {
+        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList2(String.valueOf(organId), false);
+        return Result.success(chFndSrvModes);
+    }
 
     /**
      * 查询机构下或者包含子机构下的所有护理机构

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -67,6 +67,14 @@ public interface DisableService {
     List<ChSrvOrgan> srvOrganList(String organId,Long srvOrganId, Boolean isInvolveChild);
 
     /**
+     * 查询机构意向服务机构
+     *
+     * @param organId 机构id
+     * @param isInvolveChild 是否包含子机构
+     */
+    List<ChSrvOrgan> srvOrganList2(String organId, Boolean isInvolveChild);
+
+    /**
      * 查询疾病类型
      *
      * @param parDiseTypeId 父疾病类型id

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -344,6 +344,12 @@ public class DisableServiceImpl implements DisableService {
     }
 
     @Override
+    public List<ChSrvOrgan> srvOrganList2(String organId, Boolean isInvolveChild) {
+        List<Long> organIds = organService.getOrganIds(Long.valueOf(organId), isInvolveChild);
+        return srvOrganMapper.selectList(new LambdaQueryWrapper<ChSrvOrgan>().eq(ChSrvOrgan::getStatus, (short) 0).in(ChSrvOrgan::getOrganId, organIds));
+    }
+
+    @Override
     public List<ChFndDiseaseType> fndDiseaseList(String parDiseTypeId) {
         QueryWrapper<ChFndDiseaseType> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("IS_VALID", "0");

gateway-service/src/main/java/com/hungraim/ltc/gateway/security/AuthorizationManager.java

@@ -85,6 +85,10 @@ public class AuthorizationManager implements ReactiveAuthorizationManager<Author
                     if ("ROLE_0".equals(roleId)) {
                         return true;
                     }
+                    //如果是公共资源 直接放行
+                    if ("ROLE_1".equals(roleId)) {
+                        return true;
+                    }
 
                     String[] splitpath = path.split("/");
                     String pathNew = "/" + splitpath[1] + "/" + splitpath[2] + "/*";