补贴地址

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

@@ -216,6 +216,8 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         String eartagNo = billSubsidy.getEartagNo();
         String[] eartags = eartagNo.split(",");
         String bankCardId = billSubsidy.getBankCardId();
+        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);
         }
@@ -252,10 +254,14 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
         billSubsidy.setBankName(BankUtil.getname(bankCardId));
         billSubsidy.setSubsidyName(billSubsidy.getFarmerName()+"的补贴申请");
+        billSubsidy.setDetailedAdress(sysUser.getDetailedAdress());
+        billSubsidy.setDetailedAdressCode(sysUser.getDetailedAdressCode());
+        billSubsidy.setBriefAddress(sysUser.getBriefAddress());
+        billSubsidy.setBriefAddressCode(sysUser.getBriefAddressCode());
         billSubsidy.setCreateTime(DateTime.now());
-        billSubsidy.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        billSubsidy.setCreateUser(id);
         billSubsidy.setSubsidySch(0);
-        Long userName = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        Long userName = id;
         BillSubsidy subsidy = this.getOne(new QueryWrapper<BillSubsidy>().eq("create_user", userName).eq("subsidy_sch", 7));
         if (ObjectUtil.isEmpty(subsidy)){
             this.save(billSubsidy);

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

@@ -494,6 +494,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String veterId = paramsMap.get("veterId");
         SysUser sysUser = this.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         Integer userType = sysUser.getUserType();
+
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(!StringUtils.isBlank(accoutType),"accout_type",accoutType)
                     .eq(!StringUtils.isBlank(farmType),"farm_type",farmType)