|
|
|
@ -385,7 +385,10 @@ public class ProofingInformationController { |
|
|
|
@PostMapping(value = "/queryAllProofing2") |
|
|
|
@ResponseBody |
|
|
|
public R queryAllProofing2(@RequestBody QuerySavedVo querySavedVo) { |
|
|
|
String userId = String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); |
|
|
|
SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
String userId = String.valueOf(currentUser.getUserId()); |
|
|
|
// 查询条件可由前端自由组合,用户名必须以后端会话为准,防止跨 BU 越权查询。 |
|
|
|
querySavedVo.setUserName(currentUser.getUsername()); |
|
|
|
if (querySavedVo.getQuerySavedDetailList() != null && !querySavedVo.getQuerySavedDetailList().isEmpty()) { |
|
|
|
String sql = queryCriteriaConstructorDefault.lastConditionalStatement(querySavedVo); |
|
|
|
querySavedVo.setSql(sql); |
|
|
|
@ -400,7 +403,13 @@ public class ProofingInformationController { |
|
|
|
@PostMapping(value = "/searchAllProofing") |
|
|
|
@ResponseBody |
|
|
|
public R searchAllProofing(@RequestBody ProofDocumentData inData) { |
|
|
|
String userId = String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); |
|
|
|
SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
String userId = String.valueOf(currentUser.getUserId()); |
|
|
|
// BU 权限过滤依赖 AccessBu.username,必须使用当前登录人而不是前端入参。 |
|
|
|
inData.setUsername(currentUser.getUsername()); |
|
|
|
if (inData.getSite() == null || inData.getSite().trim().isEmpty()) { |
|
|
|
inData.setSite(currentUser.getSite()); |
|
|
|
} |
|
|
|
|
|
|
|
// 查询所有打样信息(分页) |
|
|
|
PageUtils page = proofingInformationService.queryAllProofing(userId,inData); |
|
|
|
|