企业补贴

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

@@ -251,4 +251,6 @@ public class BillSubsidy extends BaseEntity implements Serializable {
     /* @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
      private Date createTime;*/
     private String payUser;
+
+    private String companyName;
 }

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

@@ -239,6 +239,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
     @Transactional(rollbackFor = RuntimeException.class)
     public Result addApplication(HttpServletRequest httpServletRequest, BillSubsidy billSubsidy) {
         Integer type = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", TokenSign.getMemberIdByJwtToken(httpServletRequest))).getUserType();
+        Long id = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", id));
 
         if (type == 2) {
             if ("".equals(billSubsidy.getFarmName())) {
@@ -247,6 +249,10 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
             if ("".equals(billSubsidy.getNameTwo())) {
                 return new Result(10001, "负责人不能为空", false);
             }
+            if (StringUtils.isBlank(sysUser.getCompanyName())){
+                return new Result(10001, "账号无法人信息,请联系管理员!", false);
+            }
+            billSubsidy.setCompanyName(sysUser.getCompanyName());
             billSubsidy.setSubsidyType(1);
         }
         if (type == 3) {
@@ -263,8 +269,7 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         if (eartags.length != billSubsidy.getRewardNum()) {
             return new Result(10001, "奖补数应与实际耳标号数量相同", false);
         }
-        Long id = TokenSign.getMemberIdByJwtToken(httpServletRequest);
-        SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", id));
+
         if (billSubsidy.getExistNum() < billSubsidy.getImportNum()) {
             return new Result(10001, "引进数应小于或等于存栏数!", false);
         }