修复

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BaseAnimal.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.huimv.farm.damsubsidy.common.utils.LongJsonSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -37,6 +40,7 @@ public class BaseAnimal extends BaseEntity implements Serializable {
     /**
      * 所属人
      */
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long belongToUser;
 
     /**
@@ -57,11 +61,13 @@ public class BaseAnimal extends BaseEntity implements Serializable {
     /**
      * 买方id
      */
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long buyerId;
 
     /**
      * 卖方id
      */
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long sellerId;
 
     /**

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BaseEntity.java

@@ -27,6 +27,8 @@ package com.huimv.farm.damsubsidy.entity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huimv.farm.damsubsidy.common.utils.LongJsonSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -54,6 +56,7 @@ public class BaseEntity implements Serializable {
      * 创建人
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long createUser;
 
     /**

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillBuyInfo.java

@@ -91,8 +91,9 @@ public class BillBuyInfo  extends BaseEntity implements Serializable {
 
     private String sellerPhone;
 
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long buyerId;
-
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long sellerId;
 
 

admin/src/main/java/com/huimv/farm/damsubsidy/entity/BillSubsidy.java

@@ -149,6 +149,7 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     /**
      * 审核部门id
      */
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long reviewedDepartId;
 
     /**

admin/src/main/java/com/huimv/farm/damsubsidy/entity/PovertyUserRegist.java

@@ -7,7 +7,9 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.huimv.farm.damsubsidy.common.annotate.DictTranslate;
+import com.huimv.farm.damsubsidy.common.utils.LongJsonSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -34,11 +36,13 @@ public class PovertyUserRegist implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private Date creatTime;
 
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long creatUser;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private Date updateTime;
 
+    @JsonSerialize(using = LongJsonSerializer.class)
     private Long updateUser;
 
     private Integer isDelete;

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -313,8 +313,13 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         billSubsidy.setCreateTime(DateTime.now());
         billSubsidy.setCreateUser(id);
         Integer count = billBuyInfoMapper.selectCount(new QueryWrapper<BillBuyInfo>().eq("inspection_num", billSubsidy.getInspectionNum()));
-        BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", billSubsidy.getInspectionNum()));
+
+        BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>()
+                .eq("inspection_num", billSubsidy.getInspectionNum())
+                .ne("inspection_type",0)
+                .eq("inspection_sch",4));
         Integer userType = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", billLandingInspection.getCreateUser())).getUserType();
+
         if (count != 0 && userType == 2){
             billSubsidy.setSaleName(billLandingInspection.getCargoOwner());
         }