Merge branch 'master' into prod

device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceChargingController.java

@@ -24,4 +24,6 @@ public class DeviceChargingController {
     public R<PageBean<DeviceChargingDto.PageVo>> page(@RequestBody DeviceChargingDto.Page page) {
         return deviceChargingService.page(page.setMercId(MercAuthUtils.getMercId()));
     }
+
+
 }

device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -150,6 +150,7 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                 algorithmPayConfigMap.put(algorithmId, algorithmPayConfig.getValue());
             }
         }
+
         for (DeviceInfo deviceInfo : list) {
             // 封装设备信息
             DeviceChargingDto.PayCheckVo payCheckVo = new DeviceChargingDto.PayCheckVo();
@@ -191,6 +192,7 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
         return R.ok(result);
     }
 
+
     @PostMapping("check")
     @ApiOperation("检查")
     public R check(@RequestBody @Validated DeviceChargingDto.Check check) {

device-api-service/src/main/java/com/xy/service/DeviceSimServiceImpl.java

@@ -203,6 +203,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         return R.ok(toPageBean(iPage));
     }
 
+
     @PostMapping("pageByNotInit")
     @ApiOperation("未初始化分页查询")
     public R<PageBean<DeviceSimDto.PageVo>> pageByNotInit(@RequestBody DeviceSimDto.Page page) {

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -328,9 +328,7 @@
         </if>
         <if test="queryPage.merc != null and queryPage.merc != ''">
             and (
-            info.merc_id = #{queryPage.merc} or info.merc_code = #{queryPage.merc} or
-            LOCATE(#{queryPage.merc}, mr.name)
-            > 0
+            info.merc_id = #{queryPage.merc} or LOCATE(#{queryPage.merc}, info.merc_code) > 0 or LOCATE(#{queryPage.merc}, mr.name) > 0
             )
         </if>
         <if test="queryPage.placeId != null">

device-api/src/main/java/com/xy/dto/DeviceSimDto.java

@@ -277,6 +277,7 @@ public class DeviceSimDto {
         private Boolean isTest;
     }
 
+
     @Data
     @Accessors(chain = true)
     public static class PageVo {