From c5c10c1bb95f5bb7fdc8b714c5c998e78c26e0f7 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 09:47:43 +0800
Subject: [PATCH] feat:标签新增、下拉增加部门id

---
 src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
index c548f23..6f296cb 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/DepartmentServiceImpl.java
@@ -1,7 +1,5 @@
 package com.mindskip.xzs.service.impl;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.mindskip.xzs.domain.Department;
 import com.mindskip.xzs.domain.enums.DeptAdminEnum;
 import com.mindskip.xzs.domain.vo.BaseSelect;
@@ -13,6 +11,7 @@
 import com.mindskip.xzs.repository.UserMapper;
 import com.mindskip.xzs.service.DepartmentService;
 import com.mindskip.xzs.utility.ModelMapperSingle;
+import com.mindskip.xzs.utility.TreeUtils;
 import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
 import org.modelmapper.ModelMapper;
 import org.springframework.stereotype.Service;
@@ -39,11 +38,9 @@
     }
 
     @Override
-    public Integer add(String name) {
-        Department department = new Department();
-        department.setDeleted("0");
-        department.setName(name);
-        return departmentMapper.add(department);
+    public Integer add(Department model) {
+        model.setDeleted("0");
+        return departmentMapper.add(model);
     }
 
     @Override
@@ -113,7 +110,7 @@
 
     @Override
     public List<Department> gets(List<Integer> deptId) {
-        return departmentMapper.gets(deptId);
+        return TreeUtils.build(departmentMapper.gets(deptId));
     }
 
     @Override

--
Gitblit v1.8.0