去掉isIncludeSubsidiaries参数

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

@@ -98,7 +98,6 @@ public class DisableController {
      * 失能人员信息列表
      *
      * @param organId               适用机构代码
-     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param districtProvincial    所在省
      * @param districtCity          所在市
      * @param districtArea          所在区域
@@ -111,11 +110,11 @@ public class DisableController {
      * @return 失能人员信息列表
      */
     @RequestMapping("/disableList")
-    public Result<List<DisableVO>> disableList(String organId, String districtProvincial, String isIncludeSubsidiaries,
+    public Result<List<DisableVO>> disableList(String organId, String districtProvincial,
                                                String districtCity, String districtArea,
                                                String realName, String certiCode, String dataFrom,
                                                String srvOrganName, int pageNum, int pageSize) {
-        IPage<DisableVO> iPage = disableService.disableList(organId, isIncludeSubsidiaries, districtProvincial,
+        IPage<DisableVO> iPage = disableService.disableList(organId, districtProvincial,
                 districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, pageNum, pageSize);
         return Result.success(iPage.getRecords());
     }

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyMapper.java

@@ -32,7 +32,7 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
      * @param dataFrom              申请来源
      * @param srvOrganName          护理机构
      */
-    Page<DisableVO> disableList(Page<DisableVO> page, List<String> organIds, String isIncludeSubsidiaries, String provincial,
+    Page<DisableVO> disableList(Page<DisableVO> page, List<String> organIds, String provincial,
                                 String city, String area, String name, String certiCode,
                                 String dataFrom, String srvOrganName);
 

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

@@ -20,7 +20,6 @@ public interface DisableService {
      * 查询所有资源对应的角色
      *
      * @param organId               适用机构代码
-     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param districtProvincial    所在省
      * @param districtCity          所在市
      * @param districtArea          所在区域
@@ -32,7 +31,7 @@ public interface DisableService {
      * @param pageSize              每页几条数据
      * @return list
      */
-    Page<DisableVO> disableList(String organId, String isIncludeSubsidiaries, String districtProvincial, String districtCity,
+    Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
                                 String districtArea, String realName, String certiCode, String dataFrom,
                                 String srvOrganId, int pageNum, int pageSize);
 

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

@@ -63,7 +63,7 @@ public class DisableServiceImpl implements DisableService {
 
 
     @Override
-    public Page<DisableVO> disableList(String organId, String isIncludeSubsidiaries, String districtProvincial, String districtCity,
+    public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
                                        String districtArea, String realName, String certiCode, String dataFrom,
                                        String srvOrganName, int page, int pageSize) {
         // 没有organId参数的时候，这个集合就为null
@@ -71,7 +71,7 @@ public class DisableServiceImpl implements DisableService {
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
-        return disableApplyMapper.disableList(new Page<>(page, pageSize), organIds, isIncludeSubsidiaries, districtProvincial,
+        return disableApplyMapper.disableList(new Page<>(page, pageSize), organIds, districtProvincial,
                 districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName);
     }