:bug: fix

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/controller/BoatController.java

@@ -60,11 +60,11 @@ public class BoatController extends CommonController {
     }
     String paramJsonData = getParamJsonData(vo.getData());
     ShipDataRequest req = JSONObject.parseObject(paramJsonData, ShipDataRequest.class);
-    if (StringUtils.isBlank(req.getShipId()) && StringUtils.isBlank(req.getShipNameCn())
-        && StringUtils.isBlank(req.getMmsi()) && StringUtils.isBlank(req.getShipTypeName())) {
-      throw new EnumException("请至少输入一个查询参数");
-    }
-    if (StringUtils.isBlank(req.getMmsi()) && req.getMmsi().length() < 6) {
+//    if (StringUtils.isBlank(req.getShipId()) && StringUtils.isBlank(req.getShipNameCn())
+//        && StringUtils.isBlank(req.getMmsi()) && StringUtils.isBlank(req.getShipTypeName())) {
+//      throw new EnumException("请至少输入一个查询参数");
+//    }
+    if (!StringUtils.isBlank(req.getMmsi()) && req.getMmsi().length() < 6) {
       throw new EnumException("mmsi不足六位");
     }
     List<ShipDataVo> voList = commonService.selectBoatInfoList(req);

ghjg-item-datashare-server/src/main/resources/mapper/CommonMapper.xml

@@ -143,7 +143,7 @@
       <if test="mmsi != null and mmsi != ''">
         and T.MMSI like #{mmsi} || '%'
       </if>
-      <if test="shipTypeCode != null and shipTypeCode != ''">
+      <if test="shipTypeName != null and shipTypeName != ''">
         and T.SHIP_TYPE_NAME = #{shipTypeName}
       </if>
       <if test="shipNameCn != null and shipNameCn != ''">