merge

governance/src/main/java/com/hungraim/ltc/governance/controller/SuperviseOrganEmpController.java

@@ -61,9 +61,9 @@ public class SuperviseOrganEmpController {
      */
     @RequestMapping("/superviseOrganEmpList")
     public Result<Page<SuperviseOrganEmpVO>> superviseOrganEmpList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
-                                                                   Long organId, Boolean isIncluded, String organName, String spvEmpType, String spvEmpName, String mobilePhone, String isLock) {
+                                                                   Long organId, Boolean isInvolveChild, String organName, String spvEmpType, String spvEmpName, String mobilePhone, String isLock) {
         Page<SuperviseOrganEmpVO> page = new Page<>(pageNum, pageSize);
-        page = superviseOrganEmpService.superviseOrganEmpList(page, organId, isIncluded, organName, spvEmpType, spvEmpName, mobilePhone, isLock);
+        page = superviseOrganEmpService.superviseOrganEmpList(page, organId, isInvolveChild, organName, spvEmpType, spvEmpName, mobilePhone, isLock);
         return Result.success(page);
     }
 
@@ -126,9 +126,9 @@ public class SuperviseOrganEmpController {
      */
     @RequestMapping("/superviseOrganList")
     public Result<Page<SuperviseOrganVO>> superviseOrganList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
-                                                             Long organId, Boolean isIncluded, String spvOrganName) {
+                                                             Long organId, Boolean isInvolveChild, String spvOrganName) {
         Page<SuperviseOrganVO> page = new Page<>(pageNum, pageSize);
-        page = superviseOrganEmpService.superviseOrganList(page, organId, isIncluded, spvOrganName);
+        page = superviseOrganEmpService.superviseOrganList(page, organId, isInvolveChild, spvOrganName);
         return Result.success(page);
     }