|
@@ -10,6 +10,7 @@ import com.usky.system.domain.SysUser;
|
|
|
import com.usky.system.domain.constants.UserConstants;
|
|
|
import com.usky.system.service.ISysDeptService;
|
|
|
import com.usky.system.service.ISysUserService;
|
|
|
+import com.usky.system.service.vo.TreeNode;
|
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
@@ -82,7 +83,7 @@ public class SysDeptController extends BaseController {
|
|
|
* 获取部门人员下拉树列表
|
|
|
*/
|
|
|
@GetMapping("/deptUserTreeSelect")
|
|
|
- public ApiResult treeselect(SysDept dept, SysUser user) {
|
|
|
+ public ApiResult <List<TreeNode>> treeselect(SysDept dept, SysUser user) {
|
|
|
List<SysDept> depts = deptService.deptList(dept);
|
|
|
List<SysUser> users = iSysUserService.selectDUserList(user);
|
|
|
return ApiResult.success(deptService.buildDeptUserTreeSelect(depts, users));
|
|
@@ -92,7 +93,7 @@ public class SysDeptController extends BaseController {
|
|
|
* 部门人员下拉树-工时统计
|
|
|
*/
|
|
|
@GetMapping("/jurisdictionDeptUserTree")
|
|
|
- public ApiResult jurisdictionDeptUserTree(SysDept dept, SysUser user) {
|
|
|
+ public ApiResult <List<TreeNode>> jurisdictionDeptUserTree(SysDept dept, SysUser user) {
|
|
|
List<SysDept> depts = deptService.selectDeptList(dept);
|
|
|
List<SysUser> users = iSysUserService.selectUserList(user);
|
|
|
return ApiResult.success(deptService.buildDeptUserTreeSelect(depts, users));
|