From 1ca22ff7b957aec64bcad120d4a6083bdae68dab Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 7 May 2019 14:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=83=A8=E9=97=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/busi/PersonnelController.java | 6 +++--- .../java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index d42e992..3c79d9d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -285,7 +285,6 @@ public class PersonnelController extends CoreBaseController { ValidatorBean.checkNotNull(id, "用户id 不能为空"); Map resultMap = new HashMap<>(); - SysUser user = personnelService.getSysUserById(Long.parseLong(id)); List refUserInfoDepartmentList = personnelService.findSysRefUserDepartmentById(user.getId()); @@ -429,12 +428,13 @@ public class PersonnelController extends CoreBaseController { public ResultBean queryRefDepartment(@RequestBody UserDetailModel model) { try { List idList = new ArrayList<>(); - model.setUserDepartmentIdList(new ArrayList(Arrays.asList(new String[]{"1072037153732694016"}))); List refs = personnelService.querySysRefUserDepartmentByUserDetailModel(model); if(refs != null && refs.size() > 0){ for (SysRefUserDepartment ref : refs) { - idList.add(ref.getUserId()); + if(!idList.contains(ref.getUserId())){ + idList.add(ref.getUserId()); + } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java index 5c93ccb..e4ef032 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java @@ -27,7 +27,7 @@ public class HqlModelPack { // And HqlPack.getNumEqualPack(model.getUserStatus(),"userStatus",result); - HqlPack.getNumEqualPack(model.getUserPhone(),"userPhone",result); + HqlPack.getStringEqualPack(model.getUserPhone(),"userPhone",result); if(idList != null && idList.size() > 0){ HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);