Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

lh_dev_fifo
wangwei 4 months ago
commit 9fad948fce

@ -139,12 +139,12 @@ public class PurApplyController {
@PostMapping("/purchase/apply/list")
public BaseResponse list(@RequestBody PurApplyRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(11); //查询未审核和草稿状态
}
if (purApplyRequest.getIsUser() != null && purApplyRequest.getIsUser()) {
AuthAdmin authAdmin = customerService.getUserBean();
purApplyRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
}else if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(11); //查询未审核和草稿状态
}
Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow"));

Loading…
Cancel
Save