Merge branch 'test' into dev

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountPaymentServiceImpl.java

@@ -24,7 +24,6 @@ import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.file.utils.ObsFileUtil;
-import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.service.ISysDeptService;
@@ -75,7 +74,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         // 归属部门
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getDepartmentId()), "ap.department_id", dto.getDepartmentId());
         // 申请人
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCreateUser()), "ap.create_user", dto.getCreateUser());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCreateUser()), "ap.data_user", dto.getCreateUser());
         // 打款类型
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()), "ap.type", dto.getType());
         // 请款时间

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRequestFundsServiceImpl.java

@@ -20,6 +20,7 @@ import com.fjhx.account.service.account.AccountRequestFundsService;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.ruoyi.common.core.domain.BasePo;
@@ -154,6 +155,7 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
     @Override
     public AccountRequestFundsVo detail(Long id) {
         AccountRequestFunds accountRequestFunds = this.getById(id);
+        Assert.notEmpty(accountRequestFunds, "查询不到请款信息");
         AccountRequestFundsVo accountRequestFundsVo = BeanUtil.toBean(accountRequestFunds, AccountRequestFundsVo.class);
 
         // 获取到请款明细信息