需求管理-选择企业：企业搜索，数据权限

happy-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -72,7 +72,7 @@ public class SysDepartController {
         Result<List<SysDepartTreeModel>> result = new Result<>();
         try {
             QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap());
-            List<SysDepartTreeModel> list = sysDepartService.queryTreeList(queryWrapper);
+            List<SysDepartTreeModel> list = sysDepartService.queryTreeList(sysDepart, queryWrapper);
             result.setResult(list);
             result.setSuccess(true);
         } catch (Exception e) {

happy-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -25,7 +25,7 @@ public interface ISysDepartService extends IService<SysDepart> {
      *
      * @return
      */
-    List<SysDepartTreeModel> queryTreeList(QueryWrapper<SysDepart> queryWrapper);
+    List<SysDepartTreeModel> queryTreeList(SysDepart sysDepart, QueryWrapper<SysDepart> queryWrapper);
 
     /**
      * 查询所有部门DepartId信息,并分节点进行显示

happy-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -42,12 +42,27 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
      */
     @Cacheable(value = CacheConstant.DEPART_INFO_CACHE)
     @Override
-    public List<SysDepartTreeModel> queryTreeList(QueryWrapper<SysDepart> queryWrapper) {
+    public List<SysDepartTreeModel> queryTreeList(SysDepart sysDepart, QueryWrapper<SysDepart> queryWrapper) {
         queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0.toString());
         queryWrapper.orderByAsc("depart_order");
         List<SysDepart> list = this.list(queryWrapper);
-        // 调用wrapTreeDataToTreeList方法生成树状数据
-        List<SysDepartTreeModel> listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list);
+        List<SysDepartTreeModel> listResult = new ArrayList<>();
+        //搜索条件不为空，则不进行树状处理
+        if (StringUtils.isNotBlank(sysDepart.getDepartName())) {
+            //update-begin--Author:huangzhilin  Date:20140417 for：[bugfree号]组织机构搜索回显优化--------------------
+            SysDepartTreeModel model = new SysDepartTreeModel();
+            if (list.size() > 0) {
+                for (SysDepart depart : list) {
+                    model = new SysDepartTreeModel(depart);
+                    model.setChildren(null);
+                    //update-end--Author:huangzhilin  Date:20140417 for：[bugfree号]组织机构搜索功回显优化----------------------
+                    listResult.add(model);
+                }
+            }
+        } else {
+            // 调用wrapTreeDataToTreeList方法生成树状数据
+            listResult = FindsDepartsChildrenUtil.wrapTreeDataToTreeList(list);
+        }
         return listResult;
     }