diff --git a/src/com/engine/organization/entity/TreeData.java b/src/com/engine/organization/entity/TreeData.java new file mode 100644 index 00000000..a34c09de --- /dev/null +++ b/src/com/engine/organization/entity/TreeData.java @@ -0,0 +1,24 @@ +package com.engine.organization.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/13 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TreeData { + private String title; + private String key; + private ArrayList children; +} diff --git a/src/com/engine/organization/mapper/post/PostMapper.java b/src/com/engine/organization/mapper/post/PostMapper.java index d118e2cf..0a8e0d82 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.java +++ b/src/com/engine/organization/mapper/post/PostMapper.java @@ -1,10 +1,12 @@ package com.engine.organization.mapper.post; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.post.po.PostPO; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; @@ -43,6 +45,12 @@ public interface PostMapper { @MapKey("id") List> listPostsByIds(@Param("ids") Collection ids); + /** + * 获取左侧树 + * @return + */ + ArrayList getTreeData(); + /** * 插入职务分类 * diff --git a/src/com/engine/organization/mapper/post/PostMapper.xml b/src/com/engine/organization/mapper/post/PostMapper.xml index 0bb49259..8ab5d466 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.xml +++ b/src/com/engine/organization/mapper/post/PostMapper.xml @@ -12,6 +12,11 @@ + + + + + t @@ -52,6 +57,10 @@ + + update jcl_org_post diff --git a/src/com/engine/organization/service/PostService.java b/src/com/engine/organization/service/PostService.java index b92013a6..3aa4194d 100644 --- a/src/com/engine/organization/service/PostService.java +++ b/src/com/engine/organization/service/PostService.java @@ -1,5 +1,6 @@ package com.engine.organization.service; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.post.po.PostPO; import java.util.Collection; @@ -44,4 +45,11 @@ public interface PostService { Map getPostForm(Map params); + /** + * 获取左侧树 + * @return + */ + TreeData getTreeData(); + + } diff --git a/src/com/engine/organization/service/impl/PostServiceImpl.java b/src/com/engine/organization/service/impl/PostServiceImpl.java index 4d5cf882..f2c627d7 100644 --- a/src/com/engine/organization/service/impl/PostServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostServiceImpl.java @@ -3,6 +3,7 @@ package com.engine.organization.service.impl; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; import com.engine.core.impl.Service; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.post.dto.PostDTO; import com.engine.organization.entity.post.po.PostPO; import com.engine.organization.mapper.post.PostMapper; @@ -75,4 +76,10 @@ public class PostServiceImpl extends Service implements PostService { apiDatas.put("condition", addGroups); return apiDatas; } + + @Override + public TreeData getTreeData() { + ArrayList treeDataList = getPostMapper().getTreeData(); + return TreeData.builder().children(treeDataList).title("全部类型").key("").build(); + } } diff --git a/src/com/engine/organization/web/PostController.java b/src/com/engine/organization/web/PostController.java index fb049a45..7e13fc8c 100644 --- a/src/com/engine/organization/web/PostController.java +++ b/src/com/engine/organization/web/PostController.java @@ -114,4 +114,22 @@ public class PostController { } } + /** + * 获取左侧树 + * @param request + * @param response + * @return + */ + @GET + @Path("/getTreeData") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getPostWrapper(user).getTreeData()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + } diff --git a/src/com/engine/organization/wrapper/PostWrapper.java b/src/com/engine/organization/wrapper/PostWrapper.java index c0ef2cc9..b978fb1f 100644 --- a/src/com/engine/organization/wrapper/PostWrapper.java +++ b/src/com/engine/organization/wrapper/PostWrapper.java @@ -2,6 +2,7 @@ package com.engine.organization.wrapper; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; +import com.engine.organization.entity.TreeData; import com.engine.organization.entity.post.po.PostPO; import com.engine.organization.service.PostService; import com.engine.organization.service.impl.PostServiceImpl; @@ -61,4 +62,12 @@ public class PostWrapper extends Service { return getPostService(user).getPostForm(params); } + /** + * 获取左侧树 + * @return + */ + public TreeData getTreeData() { + return getPostService(user).getTreeData(); + } + }