From ad32f267866247f6abab32fe945cf330c72a14f1 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 20 Feb 2023 17:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E4=BC=97=E6=A3=80=E6=9F=A5=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=88=A0=E9=99=A4=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/exam/api/ExamPaperApi.java | 1 + .../java/com/xboe/module/usergroup/api/UserGroupApi.java | 2 +- .../com/xboe/system/user/service/impl/UserServiceImpl.java | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) 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