修改bug 4827

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireExpertsService.java

@@ -18,8 +18,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 public interface IFireExpertsService {
 
 
-    public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
+    public Page<FireExpertsDto> queryForFireExpertsPage1(Page<FireExpertsDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String name,
                                                         @Condition(Operator.in) List<String> expertCode);
+    
+    public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
+            @Condition(Operator.eq) Boolean isDelete,
+            @Condition(Operator.like) String name,
+            @Condition(Operator.eq)String expertCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java

@@ -175,7 +175,7 @@ public class FireExpertsController extends BaseController {
      		}
         }
         /*  修改bug ： 4827  结束*/
-        Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsServiceImpl.queryForFireExpertsPage(page, false,
+        Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsServiceImpl.queryForFireExpertsPage1(page, false,
                 fireExpertsDto.getName(), expertCodeArr);
         List<FireExpertsDto> fireExpertsDtoList = fireExpertsDtoPage.getRecords().stream().map(item -> {
             item.setAge(DateUtils.getAge(item.getBirthdayTime()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireExpertsServiceImpl.java

@@ -26,14 +26,24 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExpe
      * 分页查询
      */
     @Override
-    public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
+    public Page<FireExpertsDto> queryForFireExpertsPage1(Page<FireExpertsDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String name,
                                                         @Condition(Operator.in) List<String> expertCode) {
         // 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm
         return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode);
     }
-
+    /**
+     * 分页查询
+     */
+    @Override
+    public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
+                                                        @Condition(Operator.eq) Boolean isDelete,
+                                                        @Condition(Operator.like) String name,
+                                                        @Condition(Operator.eq)String expertCode) {
+        // 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm
+        return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode);
+    }
     /**
      * 列表查询 示例
      */