From 969018bafd4fbed494e5ede2a85380c0d9c5b915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=84=B1?= Date: Wed, 7 Aug 2019 19:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cwhelp/admin/business/controller/BssEmployeeController.java | 2 +- .../com/cwhelp/modules/system/service/impl/UserServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java b/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java index 48c4982..d86607f 100644 --- a/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java +++ b/admin/src/main/java/com/cwhelp/admin/business/controller/BssEmployeeController.java @@ -54,7 +54,7 @@ public class BssEmployeeController { User user = ShiroUtil.getSubject(); List bssDepts = null; - if (AdminConst.ADMIN_PLATFORM_ID != user.getBssPlatform().getId()) { + if (AdminConst.ADMIN_PLATFORM_ID.equals(user.getBssPlatform().getId())) { bssDepts = bssDeptService.findBssDeptByBssPlatformAndId(user.getBssPlatform()); } Page list = bssEmployeeService.getPageList(bssDepts,bssEmployee); diff --git a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java index f5fbffa..0113548 100644 --- a/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java +++ b/modules/system/src/main/java/com/cwhelp/modules/system/service/impl/UserServiceImpl.java @@ -111,7 +111,7 @@ public class UserServiceImpl implements UserService { preList.add(in); } // 1 为财务帮平台超级账号 - if (AdminConst.ADMIN_PLATFORM_ID != user.getBssPlatform().getId()) { + if (AdminConst.ADMIN_PLATFORM_ID.equals(user.getBssPlatform().getId())) { BssPlatform bssPlatform = user.getBssPlatform(); Join join = root.join("bssPlatform", JoinType.INNER); Predicate eq = cb.equal(join.get("id").as(Long.class),bssPlatform.getId());