|
@@ -1,12 +1,13 @@
|
|
package com.persagy.fm.department.controller;
|
|
package com.persagy.fm.department.controller;
|
|
|
|
|
|
import com.persagy.fm.common.constant.enums.BoolEnum;
|
|
import com.persagy.fm.common.constant.enums.BoolEnum;
|
|
-import com.persagy.fm.common.response.*;
|
|
|
|
|
|
+import com.persagy.fm.common.response.CommonResult;
|
|
|
|
+import com.persagy.fm.common.response.FmResponseUpsertVO;
|
|
|
|
+import com.persagy.fm.common.response.PageList;
|
|
import com.persagy.fm.common.utils.ResultHelper;
|
|
import com.persagy.fm.common.utils.ResultHelper;
|
|
import com.persagy.fm.department.model.ConvertDepartmentTool;
|
|
import com.persagy.fm.department.model.ConvertDepartmentTool;
|
|
import com.persagy.fm.department.model.Department;
|
|
import com.persagy.fm.department.model.Department;
|
|
import com.persagy.fm.department.model.dto.*;
|
|
import com.persagy.fm.department.model.dto.*;
|
|
-import com.persagy.fm.department.model.vo.ManagerVO;
|
|
|
|
import com.persagy.fm.department.model.vo.ResponseDepartmentItemVO;
|
|
import com.persagy.fm.department.model.vo.ResponseDepartmentItemVO;
|
|
import com.persagy.fm.department.model.vo.ResponseDepartmentListItemVO;
|
|
import com.persagy.fm.department.model.vo.ResponseDepartmentListItemVO;
|
|
import com.persagy.fm.department.model.vo.ResponseDepartmentTreeItemVO;
|
|
import com.persagy.fm.department.model.vo.ResponseDepartmentTreeItemVO;
|
|
@@ -17,16 +18,11 @@ import com.persagy.fm.department.utils.DepDataUtil;
|
|
import com.persagy.fm.depproject.model.DepProject;
|
|
import com.persagy.fm.depproject.model.DepProject;
|
|
import com.persagy.fm.depproject.model.dto.QueryDepProjectDTO;
|
|
import com.persagy.fm.depproject.model.dto.QueryDepProjectDTO;
|
|
import com.persagy.fm.depproject.service.IDepProjectService;
|
|
import com.persagy.fm.depproject.service.IDepProjectService;
|
|
-import com.persagy.fm.mybatis.service.CreateDbService;
|
|
|
|
-import com.persagy.fm.person.service.IPersonService;
|
|
|
|
import com.persagy.fm.saas.project.model.vo.ProjectTreeItemVO;
|
|
import com.persagy.fm.saas.project.model.vo.ProjectTreeItemVO;
|
|
import com.persagy.fm.translate.model.Trans;
|
|
import com.persagy.fm.translate.model.Trans;
|
|
import com.persagy.fm.translate.model.TransType;
|
|
import com.persagy.fm.translate.model.TransType;
|
|
-import com.persagy.fm.translate.model.Transes;
|
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
-import org.assertj.core.util.Lists;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
@@ -36,7 +32,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
-import java.util.Arrays;
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|