后台5

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.admin.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -1000,17 +1001,32 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
             // ProCountDto proCountDto = new ProCountDto();
             queryWrapper.eq("farm_id", farmId).eq("type", 1).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData = writeProtDataMapper.selectOne(queryWrapper);
-            jsonObject.put("in", writeProtData);
+            if (ObjectUtil.isEmpty(writeProtData)) {
+                jsonObject.put("in", 0);
+            } else {
+                jsonObject.put("in", writeProtData);
+            }
+
 
             QueryWrapper<WriteProtData> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("farm_id", farmId).eq("type", 2).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData1 = writeProtDataMapper.selectOne(queryWrapper1);
-            jsonObject.put("deal", writeProtData1);
+            if (ObjectUtil.isEmpty(writeProtData1)) {
+                jsonObject.put("deal", 0);
+            } else {
+                jsonObject.put("deal", writeProtData1);
+            }
+
 
             QueryWrapper<WriteProtData> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("farm_id", farmId).eq("type", 3).orderByDesc("create_date").last(" limit 1");
             WriteProtData writeProtData2 = writeProtDataMapper.selectOne(queryWrapper2);
-            jsonObject.put("out", writeProtData2);
+            if (ObjectUtil.isEmpty(writeProtData2)) {
+                jsonObject.put("out", 0);
+            } else {
+                jsonObject.put("out", writeProtData2);
+            }
+
         }