diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamPaperApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamPaperApi.java index 1add0cfe..83ddc90f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamPaperApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamPaperApi.java @@ -54,6 +54,7 @@ public class ExamPaperApi extends ApiBaseController { PageList pageList = examPaperService.queryList(pager.getPageIndex(),pager.getPageSize(),examPaperDto); return success(pageList); } + /** * 添加 * */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/usergroup/api/UserGroupApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/usergroup/api/UserGroupApi.java index 258a48a7..33f7bf97 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/usergroup/api/UserGroupApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/usergroup/api/UserGroupApi.java @@ -298,7 +298,7 @@ public class UserGroupApi extends ApiBaseController { UserImportDto dto=userImportDtos.get(un); // System.out.println(dto.getIsSuccess()+"错误情况"); if(dto!=null && !dto.getIsSuccess() && StringUtils.isBlank(dto.getException())) { - dto.setException("工号找不到"); + dto.setException("工号找不到或用户已经删除"); } } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java index 94a48b11..74dab1f6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/UserServiceImpl.java @@ -87,7 +87,10 @@ public class UserServiceImpl implements IUserService { @Override public List getListByUserNos(List userNos) { - return dao.getListByUserNos(userNos); + // return dao.getListByUserNos(userNos); + //return dao.findList(FieldFilters.in("userNo", userNos)); + String hql="Select u from "+User.class.getSimpleName()+" u,"+Account.class.getSimpleName()+" a where u.id=a.id and a.deleted=?1"; + return dao.findListByHql(hql, false); } @Override