refactor(system): 优化部门和用户树查询逻辑

- 修改了 queryDeptAndEmpTreeList 和 queryDeptAndUserTreeList 方法的参数处理逻辑
- 优化了空值判断和默认值设置，提高了代码的健壮性
-调用了新的 TreeUtils.buildTreeForParentId 方法，可能提升了树构建的性能或准确性

@@ -437,16 +437,16 @@ public class SysDepartController {
     @RequestMapping(value = "/queryDeptAndEmpTreeList", method = RequestMethod.GET)
     public Result<List<TreeData>> queryDeptAndEmpTreeList(String departId,String roleId) {
         //根据token获取该用户厂id
-        departId = BaseContextHandler.getRealDepartId();
-        String orgType = ConvertUtils.getString(BaseContextHandler.get("orgType"));
-        if (!StringUtils.isEmpty(orgType)) {
+//        departId = BaseContextHandler.getRealDepartId();
+//        String orgType = ConvertUtils.getString(BaseContextHandler.get("orgType"));
+        if (StringUtils.isEmpty(departId)) {
             departId = ConvertUtils.getString(BaseContextHandler.getRealDepartId());
         }
         //获取数据列表
         List<SysDeptUserVO> list = sysDepartService.queryDeptAndEmpTreeList(departId,roleId);
         //将业务数据转换为构造树所需的数据结构
         List<TransTreeModel> transTreeModels = list.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
-        List<TreeData> treeList = TreeUtils.buildTree(transTreeModels, departId);
+        List<TreeData> treeList = TreeUtils.buildTreeForParentId(transTreeModels, departId);
         Result<List<TreeData>> result = new Result<>();
         try {
             result.setResult(treeList);
@@ -464,6 +464,9 @@ public class SysDepartController {
      */
     @RequestMapping(value = "/queryDeptAndUserTreeList", method = RequestMethod.GET)
     public Result<List<TreeData>> queryDeptAndUserTreeList(String departId,String userType) {
+        if (StringUtils.isEmpty(departId)) {
+            departId = ConvertUtils.getString(BaseContextHandler.getRealDepartId());
+        }
         //获取数据列表
         List<SysDeptUserVO> list = sysDepartService.queryDeptAndUserTreeList(departId,userType);
         //将业务数据转换为构造树所需的数据结构