李进 преди 2 години
родител
ревизия
876ef7649b
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml
  2. 1 1
      device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

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

@@ -142,7 +142,7 @@
         </if>
         <if test="queryPage.no != null and queryPage.no != ''">
             and (
-                LOCATE(#{queryPage.no}, info.device_id) > 0 or LOCATE(#{queryPage.no}, info.merc_device_code) > 0 or LOCATE(#{queryPage.no}, sysinfo.device_sn) > 0
+                LOCATE(#{queryPage.no}, info.merc_device_code) > 0 or LOCATE(#{queryPage.no}, sysinfo.device_sn) > 0or LOCATE(#{queryPage.no}, sysinfo.sim_iccid) > 0
             )
         </if>
         <if test="queryPage.activeState != null">

+ 1 - 1
device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -48,7 +48,7 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "分页对象", required = true)
         private PageBean page;
 
-        @ApiModelProperty("机器/资产/sn/sim号")
+        @ApiModelProperty("资产/sn/sim号")
         private String no;
 
         @ApiModelProperty("商户id/商户号/商户名称")