Commit 57465525 authored by chenyuxi's avatar chenyuxi

feat: 去掉暂时不用的传参+根据账号名查用户加上删除标识的过滤

parent dc3bce06
...@@ -210,7 +210,7 @@ public abstract class AbastractAuditProcess<T,E extends T> { ...@@ -210,7 +210,7 @@ public abstract class AbastractAuditProcess<T,E extends T> {
* @return R<List<SysUser>> * @return R<List<SysUser>>
**/ **/
public R<List<SysUser>> getAuditUserList(String entityId, YifuUser loginUser, String departId, String processType, String auditType, public R<List<SysUser>> getAuditUserList(String entityId, YifuUser loginUser, String departId, String processType, String auditType,
String reason, String entityName, T entity, Class<T> clazz) { String reason, String entityName, T entity) {
// 获取审批流程完整配置 // 获取审批流程完整配置
ProcessVo processVo = this.getProcessVoByType(processType); ProcessVo processVo = this.getProcessVoByType(processType);
if (Common.isEmpty(processVo)) { if (Common.isEmpty(processVo)) {
......
...@@ -614,7 +614,7 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance ...@@ -614,7 +614,7 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
// 传:流程类型 1不购买商险申请;审核类型 0不购买商险审核 // 传:流程类型 1不购买商险申请;审核类型 0不购买商险审核
R<List<SysUser>> auditUserListR = tInsuranceUnpurchaseApplyAuditProcess.getAuditUserList(id, user, entity.getCreateUserDeptId(), R<List<SysUser>> auditUserListR = tInsuranceUnpurchaseApplyAuditProcess.getAuditUserList(id, user, entity.getCreateUserDeptId(),
CommonConstants.ONE_STRING, CommonConstants.ZERO_STRING, CommonConstants.ONE_STRING, CommonConstants.ZERO_STRING,
"", entity.getApplyNo(), entity, TInsuranceUnpurchaseApply.class); "", entity.getApplyNo(), entity);
if (auditUserListR == null || auditUserListR.getCode() != CommonConstants.SUCCESS || auditUserListR.getData() == null) { if (auditUserListR == null || auditUserListR.getCode() != CommonConstants.SUCCESS || auditUserListR.getData() == null) {
throw new CheckedException("获取审批人失败,请联系管理员"); throw new CheckedException("获取审批人失败,请联系管理员");
} }
......
...@@ -454,7 +454,8 @@ public class UserController { ...@@ -454,7 +454,8 @@ public class UserController {
@Inner @Inner
@PostMapping(value = {"/inner/getSimpleUserByLoginName"}) @PostMapping(value = {"/inner/getSimpleUserByLoginName"})
public SysUser getSimpleUserByLoginName(@RequestBody String loginName) { public SysUser getSimpleUserByLoginName(@RequestBody String loginName) {
return userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername,loginName).last(CommonConstants.LAST_ONE_SQL)); return userService.getOne(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername,loginName)
.eq(SysUser::getDelFlag,CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment