|
@@ -84,7 +84,11 @@ public class IllegallyTypeController extends ControllerSupport {
|
|
|
Specification<IllegallyTypeEntity> specification = (root, query, cb) -> {
|
|
|
List<Predicate> predicates = new ArrayList<>();
|
|
|
|
|
|
- predicates.add(cb.equal(root.get("rootOrgId"), accessUser.getRootOrgId()));
|
|
|
+ List<Long> rootOrgIdList = new ArrayList<>();
|
|
|
+ rootOrgIdList.add(accessUser.getRootOrgId());
|
|
|
+ rootOrgIdList.add(-1L);//系统级别的数据默认rootOrgId为-1
|
|
|
+
|
|
|
+ predicates.add(root.get("rootOrgId").in(rootOrgIdList));
|
|
|
|
|
|
if (StringUtils.isNotBlank(name)) {
|
|
|
predicates.add(cb.like(root.get("name"), toSqlSearchPattern(name)));
|
|
@@ -147,7 +151,7 @@ public class IllegallyTypeController extends ControllerSupport {
|
|
|
rootOrgIdList.add(rootOrgId);
|
|
|
rootOrgIdList.add(-1L);//系统级别的数据默认rootOrgId为-1
|
|
|
|
|
|
- predicates.add(cb.in(root.get("rootOrgId").in(rootOrgIdList)));
|
|
|
+ predicates.add(root.get("rootOrgId").in(rootOrgIdList));
|
|
|
|
|
|
if (StringUtils.isNotBlank(name)) {
|
|
|
predicates.add(cb.like(root.get("name"), toSqlSearchPattern(name)));
|