提交 cb7d0fbb authored 作者: gongwenjie's avatar gongwenjie

Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

# Conflicts: # notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/AttendanceController.java
上级 56551497
......@@ -429,7 +429,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
List<WorkoverAppro> workoverApproList = new ArrayList<>();
if(pageRequest.getId()!=null){
String userId = pageRequest.getId();
List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByAuditIdAndStatusIn(userId,statusList);
List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByStatusIn(statusList);
workoverAppros.forEach(workoverAppro -> {
String departmentId = workoverAppro.getDepartmentId();
String departmentLevel = iUserService.getDepartmentLevel(departmentId);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论