feat：优化权限和角色

flyfish-user/src/main/java/com/flyfish/framework/domain/DepartmentQo.java

@@ -4,6 +4,7 @@ import com.flyfish.framework.domain.po.Department;
 import com.flyfish.framework.domain.tree.TreeQo;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * 部门（校区）查询实体
@@ -18,4 +19,9 @@ public class DepartmentQo extends TreeQo<Department> {
      * 额外的参数，仅针对getList指定，一般用于回显父级部门
      */
     private String additional;
+
+    @Override
+    public boolean isEmpty() {
+        return super.isEmpty() && StringUtils.isBlank(additional);
+    }
 }

flyfish-user/src/main/java/com/flyfish/framework/domain/RoleQo.java

@@ -36,4 +36,14 @@ public class RoleQo extends NameLikeQo<Role> {
     public CriteriaBuilder<Role> criteriaBuilder() {
         return super.criteriaBuilder().with("admin", "system");
     }
+
+    /**
+     * 因存在不稳定因素，永不为空
+     *
+     * @return 结果
+     */
+    @Override
+    public boolean isEmpty() {
+        return false;
+    }
 }

flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java

@@ -90,7 +90,7 @@ public class RoleService extends BaseReactiveServiceImpl<Role> {
                         .flatMapMany(ids -> {
                             RoleQo qo = (RoleQo) query;
                             qo.setIds(ids);
-                            if (CollectionUtils.isEmpty(qo.getAdditions())) {
+                            if (CollectionUtils.isNotEmpty(qo.getAdditions())) {
                                 qo.getIds().addAll(qo.getAdditions());
                             }
                             return super.getList(qo);