From d5f42ee1834c8fb95d71faf62239a0cce9b4f9f2 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 13 Mar 2019 18:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=8E=92=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/sys/entity/Post.java | 2 +- .../modules/sys/web/PostController.java | 30 + web/db/test.erm | 1072 ++++++++--------- 3 files changed, 567 insertions(+), 537 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java index a9a2b8a5..735a4c4a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java @@ -19,7 +19,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(name="post_name", attrName="postName", label="岗位名称"), @Column(name="post_type", attrName="postType", label="岗位分类", comment="岗位分类（高管、中层、基层）"), @Column(name="post_sort", attrName="postSort", label="岗位排序", comment="岗位排序（升序）"), - }, orderBy="a.update_date DESC" + }, orderBy="a.post_sort ASC" ) public class Post extends DataEntity { diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java index 26d9f077..8a5e62e8 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java @@ -3,6 +3,9 @@ */ package com.jeesite.modules.sys.web; +import java.util.List; +import java.util.Map; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -17,8 +20,11 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import com.jeesite.common.collect.ListUtils; +import com.jeesite.common.collect.MapUtils; import com.jeesite.common.config.Global; import com.jeesite.common.entity.Page; +import com.jeesite.common.lang.StringUtils; import com.jeesite.common.web.BaseController; import com.jeesite.modules.sys.entity.Post; import com.jeesite.modules.sys.service.PostService; @@ -122,5 +128,29 @@ public class PostController extends BaseController { } return Global.FALSE; } + + /** + * 获取岗位树结构数据 + * @param isAll 是否显示所有机构（true：不进行权限过滤） + * @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示） + * @return + */ + @RequiresPermissions("user") + @RequestMapping(value = "treeData") + @ResponseBody + public List> treeData(String userType, String isShowCode, String ctrlPermi) { + List> mapList = ListUtils.newArrayList(); + Post where = new Post(); + where.setStatus(Post.STATUS_NORMAL); + List list = postService.findList(where); + list.forEach(e -> { + Map map = MapUtils.newHashMap(); + map.put("id", e.getId()); + map.put("pId", "0"); + map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getPostCode(), e.getPostName())); + mapList.add(map); + }); + return mapList; + } } \ No newline at end of file diff --git a/web/db/test.erm b/web/db/test.erm index 0e62cfae..39bf064e 100644 --- a/web/db/test.erm +++ b/web/db/test.erm @@ -11,8 +11,8 @@ 0 1.0 - 131 - 31 + 0 + 0 128 128 @@ -168,7 +168,7 @@ - b6d7af0ea5dad1a0925ff63d5bd2d33946640369 + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef 64 null false @@ -184,7 +184,7 @@ varchar(n) - 810c114a1c22e1766589ec6b6da020db683137f8 + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d 100 null false @@ -1020,538 +1020,12 @@ - fb11bc47b30b0d8e468d3cd16ed660bf57bc8863 - 217 - 320 + e553474c37270813e70025e433a4cf8a64653e13 + 438 + 387Segoe UI9 - 396 - 36 - - 128 - 128 - 192 - - - - test_data_child - 测试数据子表 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - 34477707bcf8a7810e12e9565aff085f6fb1e0ad - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - ae103dc1fb50094552e56afd72015481271913db - ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9 - - - - - integer - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - d829e707316a49d39e5a11da5f5d36030a856b86 - b095c44611ed08156277676d9a3a0ce52b9b05ef - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - ac02f2d1fff63fa66db583735eb1c8e9b466872f - 78715aa66a10a9b190ad69b8ed792e9a2f4946e3 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2fed92437d28f1427e913aba1251fe0807c7b209 - 693f8af2fe6cf45255b6f2bc7e9077f3630c3dd8 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6697b12cf2f6d7135570c2a581212ee067c13206 - 04216c384533b70b8e86b571fa2beef7157bab5a - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c - 0b6f63094be90aa8674460cce26be10327827ceb - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 791691b791efedc2d14867a152b4de58f4567326 - 363e8cfcf4a6b228e656decadacba29280906555 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cdc46f802299958a2b3140200410caf5cbeb8a27 - 7875aa5fee3d6f9587180fb8fce9343a56cdc34e - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a27ebfd109532e2f551b101a0c78b3f50a3d58dd - 61c49a2f7807c55c8f85110c30889d5b403e4b04 - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 95ec23c1b2704817cca94d169aed5e11deb0adbb - b91171b99f3628aadb0e6986fbfa30cc547b280e - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2eda719a62fb7e1d3face62555046d938abddda9 - 9f33d190101e56f93f5ece0fd7c5cdda3e704b4c - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - e2270df5e0974bf471fdfe36e29bc9a8aa1774cb - 16121b5aa08fc170883408ec2d0487281a132d9d - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 23b25e48c87be0e4f3952f7a8330594e9d511a4e - 1afc7f146271f5c90ea811aa24c08ce25d12552e - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 8bc627205b6e55931d09079fcd07bfacbbd38f41 - 343f0db997b913f299b0496c4306d3617ad708de - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - - - - - - - -
- - b7226377b79c26a490f7bf5789c1f74ed96e1b6f - 359 - 323 - Segoe UI - 9 - 756 + 86436 128 @@ -2105,6 +1579,532 @@
+ + 5a836e654b7b7d19f102e87336fefa079d98a2e6 + 438 + 346 + Segoe UI + 9 + 468 + 36 + + 128 + 128 + 192 + + + + test_data_child + 测试数据子表 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + 34477707bcf8a7810e12e9565aff085f6fb1e0ad + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ae103dc1fb50094552e56afd72015481271913db + ec8a047dffe3cf2e4d95ba3e26c3bac0382d95c9 + + + + + integer + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + d829e707316a49d39e5a11da5f5d36030a856b86 + b095c44611ed08156277676d9a3a0ce52b9b05ef + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 78715aa66a10a9b190ad69b8ed792e9a2f4946e3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2fed92437d28f1427e913aba1251fe0807c7b209 + 693f8af2fe6cf45255b6f2bc7e9077f3630c3dd8 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 04216c384533b70b8e86b571fa2beef7157bab5a + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + 0b6f63094be90aa8674460cce26be10327827ceb + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 791691b791efedc2d14867a152b4de58f4567326 + 363e8cfcf4a6b228e656decadacba29280906555 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 7875aa5fee3d6f9587180fb8fce9343a56cdc34e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a27ebfd109532e2f551b101a0c78b3f50a3d58dd + 61c49a2f7807c55c8f85110c30889d5b403e4b04 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 95ec23c1b2704817cca94d169aed5e11deb0adbb + b91171b99f3628aadb0e6986fbfa30cc547b280e + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2eda719a62fb7e1d3face62555046d938abddda9 + 9f33d190101e56f93f5ece0fd7c5cdda3e704b4c + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e2270df5e0974bf471fdfe36e29bc9a8aa1774cb + 16121b5aa08fc170883408ec2d0487281a132d9d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + 1afc7f146271f5c90ea811aa24c08ce25d12552e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + 343f0db997b913f299b0496c4306d3617ad708de + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + + + + + +
@@ -2184,7 +2184,7 @@ BaseEntityCorp - b6d7af0ea5dad1a0925ff63d5bd2d33946640369 + 136ca02f1b3a96a8f2e242d5dd64d48f566143ef b8ea4b73d6d32a222e5abfd453287575ae518480 @@ -2217,7 +2217,7 @@ - 810c114a1c22e1766589ec6b6da020db683137f8 + f116706ac00cd3a3ee88b2a88debf7ebc3eeb12d b94f5fe344185c40739cf93d1090686001bb11e0