|
@@ -388,25 +388,19 @@ public class OrgController extends ControllerSupport {
|
|
|
* 方法注释
|
|
|
*
|
|
|
* @author WANGWEI
|
|
|
- * @param enable
|
|
|
- * 是否可用
|
|
|
* @param includeRoot
|
|
|
* 返回集合是否包含parentId对应的机构对象
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "查询全量机构树")
|
|
|
@GetMapping("queryFullOrgTree")
|
|
|
- public List<OrgDomain> queryFullOrgTree(@RequestParam(required = false) Boolean enable,
|
|
|
- @RequestParam(required = false) String propertyKeys) {
|
|
|
+ public List<OrgDomain> queryFullOrgTree(@RequestParam(required = false) String propertyKeys) {
|
|
|
User accessUser = getAccessUser();
|
|
|
Long rootOrgId = accessUser.getRootOrgId();
|
|
|
|
|
|
Specification<OrgEntity> specification = (root, query, cb) -> {
|
|
|
List<Predicate> predicates = new ArrayList<>();
|
|
|
predicates.add(cb.equal(root.get("rootId"), rootOrgId));
|
|
|
- if (null != enable) {
|
|
|
- predicates.add(cb.equal(root.get("enable"), enable));
|
|
|
- }
|
|
|
|
|
|
return cb.and(predicates.toArray(new Predicate[predicates.size()]));
|
|
|
};
|