dengyj 3 år sedan
förälder
incheckning
3b9fa05e4a

+ 1 - 2
src/main/java/com/steerinfo/SysManageApplication.java

@@ -71,8 +71,7 @@ public class SysManageApplication implements WebMvcConfigurer {
         FastJsonConfig fastJsonConfig = new FastJsonConfig();
         // 3.添加配置
         fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");                       // 自定义时间格式
-        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue
-                ,SerializerFeature.WriteNullStringAsEmpty); // 正常转换 null 值
+        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue); // 正常转换 null 值
         SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance();
         serializeConfig.put(Float.TYPE, ToStringSerializer.instance);
         serializeConfig.put(Float.class, ToStringSerializer.instance);

+ 1 - 1
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -398,7 +398,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (model.getValueFlag().equals(DbConstants.NET)) {
                 throw new MarkerMetException(500, "已结净的数据不可再废除!!");
             }
-            if (model.getPredictionNo() != null && model.getPredictionNo().equals("")) {
+            if (model.getPredictionNo() != null && !model.getPredictionNo().equals("")) {
                 throw new MarkerMetException(500, "已匹配委托的数据不可再废除!!");
             }