diff --git a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java index a0103cae..64ba294c 100644 --- a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java +++ b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java @@ -68,6 +68,23 @@ public class AuthContextUtils { return loginUser.getUserId(); } + /** + * 系统用户ID + * @return + */ + public static String getSysUserId(Boolean throwEx){ + if(throwEx){ + return getSysUserId(); + }else { + LoginUser loginUser = getLoginUser(false); + if(loginUser==null){ + return null; + }else { + return loginUser.getUserId(); + } + } + } + /** * 判断是否超级管理员 * @return diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 1d21f8cf..d0a16240 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -236,7 +236,7 @@ public class TbsCostApplyController { */ @PostMapping("/pageMy") @PreAuthorize("hasRole('tbs:costApply:query')") - public R> getPageMy4Post(TbsCostApplyVo param){ + public R> getPageMy4Post(@RequestBody TbsCostApplyVo param){ PageUtil.setPageSize(param.getPageSize()); PageUtil.setPageNum(param.getPageNum()); return this.getPageMy(param); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index 0cb4052c..cf9668e6 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.vtb.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.framework.manager.AsyncFactory; import com.qs.serve.common.framework.manager.AsyncManager; +import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.*; import com.qs.serve.modules.data.entity.DataAffairCommit; @@ -472,6 +473,7 @@ public class VtbVerificationApplication { vtbVer.setAmount(totalAmount); vtbVer.setFinishedTime(LocalDateTime.now()); vtbVer.setRegReleaseFlag(verification.getRegReleaseFlag()); + vtbVer.setRegReleaseUserId(AuthContextUtils.getSysUserId(false)); vtbVerificationService.updateById(vtbVer); //刷新本次核销数据 vtbVerificationService.successCommit(verification.getId()); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 9076962e..3807a329 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -467,14 +467,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl