Merge remote-tracking branch 'origin/master'

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

@@ -375,10 +375,10 @@ public class DisableController {
     @GetMapping("/listDisInfoChangeExamine")
     public Result<Page<DisableInfoChangeVo>> getListDisInfoChangeExamine(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
                                                                          Long organId, Boolean isChildGroup, String districtProvincial, String districtCity, String districtArea,
-                                                                         String realName, String certiCode, String aplOrganName, Short applyStatus) {
+                                                                         String realName, String certiCode, String srvOrganName, Short applyStatus) {
         Page<DisableInfoChangeVo> page = new Page<>(pageNum, pageSize);
         page = disableService.ListDisInfoChangeExamine(page, organId, isChildGroup, districtProvincial
-                , districtCity, districtArea, realName, certiCode, aplOrganName, applyStatus);
+                , districtCity, districtArea, realName, certiCode, srvOrganName, applyStatus);
         return Result.success(page);
 
     }

apply/apply-service/src/main/resources/mapper/DisableInfoChangeMapper.xml

@@ -50,7 +50,7 @@
             <if test="aplOrganName != null and aplOrganName != ''">
                 and srvOrgan.SRV_ORGAN_NAME like CONCAT(CONCAT('%',#{aplOrganName}) ,'%')
             </if>
-            <if test="applyStatus != null and applyStatus != ''">
+            <if test="applyStatus != null">
                 and change.APPLY_STATUS = #{applyStatus}
             </if>
         </where>