manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

所有treeData接口增加parentCode参数，获取一级数据。

Browse Source
This commit is contained in:
jeesite
2021-12-28 14:06:38 +08:00
parent 3c00e7dee1
commit b2a43e3cef
6 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/main/java/com/jeesite/modules/sys/web/AreaController.java
View File

@@ -219,11 +219,12 @@ public class AreaController extends BaseController {
@RequiresPermissions("user") @RequiresPermissions("user")
@RequestMapping(value = "treeData") @RequestMapping(value = "treeData")
@ResponseBody @ResponseBody
public List<Map<String, Object>> treeData(String excludeCode, String isShowCode, String parentCode) { public List<Map<String, Object>> treeData(String excludeCode, String parentCode, String isShowCode) {
List<Map<String, Object>> mapList = ListUtils.newArrayList(); List<Map<String, Object>> mapList = ListUtils.newArrayList();
List<Area> list = null; List<Area> list = null;
if (StringUtils.isNotBlank(parentCode)){ if (StringUtils.isNotBlank(parentCode)){
Area where = new Area(); Area where = new Area();
where.setStatus(Area.STATUS_NORMAL);
where.setParentCode(parentCode); where.setParentCode(parentCode);
list = areaService.findList(where); list = areaService.findList(where);
}else{ }else{

7
modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
View File

@@ -212,6 +212,7 @@ public class CompanyController extends BaseController {
/** /**
* 获取公司树结构数据 * 获取公司树结构数据
* @param excludeCode 排除的ID * @param excludeCode 排除的ID
* @param parentCode 设置父级编码返回一级
* @param isAll 是否显示所有机构（true：不进行权限过滤） * @param isAll 是否显示所有机构（true：不进行权限过滤）
* @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示） * @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示）
* @param isShowFullName 是否显示全公司名称 * @param isShowFullName 是否显示全公司名称
@@ -220,11 +221,14 @@ public class CompanyController extends BaseController {
@RequiresPermissions("user") @RequiresPermissions("user")
@RequestMapping(value = "treeData") @RequestMapping(value = "treeData")
@ResponseBody @ResponseBody
public List<Map<String, Object>> treeData(String excludeCode, Boolean isAll, String isShowCode, public List<Map<String, Object>> treeData(String excludeCode, String parentCode, Boolean isAll, String isShowCode,
String isShowFullName, String ctrlPermi) { String isShowFullName, String ctrlPermi) {
List<Map<String, Object>> mapList = ListUtils.newArrayList(); List<Map<String, Object>> mapList = ListUtils.newArrayList();
Company where = new Company(); Company where = new Company();
where.setStatus(Company.STATUS_NORMAL); where.setStatus(Company.STATUS_NORMAL);
if (StringUtils.isNotBlank(parentCode)){
where.setParentCode(parentCode);
}
if (!(isAll != null && isAll) || Global.isStrictMode()){ if (!(isAll != null && isAll) || Global.isStrictMode()){
companyService.addDataScopeFilter(where, ctrlPermi); companyService.addDataScopeFilter(where, ctrlPermi);
} }
@@ -254,6 +258,7 @@ public class CompanyController extends BaseController {
map.put("code", e.getViewCode()); map.put("code", e.getViewCode());
map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getViewCode(), name)); map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getViewCode(), name));
map.put("title", e.getFullName()); map.put("title", e.getFullName());
map.put("isParent", !e.getIsTreeLeaf());
mapList.add(map); mapList.add(map);
} }
return mapList; return mapList;

8
modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
View File

@@ -268,7 +268,7 @@ public class OfficeController extends BaseController {
/** /**
* 获取机构树结构数据 * 获取机构树结构数据
* @param excludeCode 排除的ID * @param excludeCode 排除的ID
* @param parentCode 上级Code * @param parentCode 设置父级编码返回一级
* @param isAll 是否显示所有机构（true：不进行权限过滤） * @param isAll 是否显示所有机构（true：不进行权限过滤）
* @param officeTypes 机构类型（1：省级公司；2：市级公司；3：部门） * @param officeTypes 机构类型（1：省级公司；2：市级公司；3：部门）
* @param companyCode 仅查询公司下的机构 * @param companyCode 仅查询公司下的机构
@@ -328,10 +328,8 @@ public class OfficeController extends BaseController {
map.put("code", e.getViewCode()); map.put("code", e.getViewCode());
map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getViewCode(), name)); map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getViewCode(), name));
map.put("title", e.getFullName()); map.put("title", e.getFullName());
// 如果需要加载用户，则处理用户数据 // 返回是否是父节点，如果需要加载用户，则全部都是父节点，来加载用户数据
if (StringUtils.inString(isLoadUser, "true", "lazy")) { map.put("isParent", !e.getIsTreeLeaf() || StringUtils.inString(isLoadUser, "true", "lazy"));
map.put("isParent", true);
}
mapList.add(map); mapList.add(map);
} }
// 一次性后台加载用户，若数据量比较大，建议使用懒加载 // 一次性后台加载用户，若数据量比较大，建议使用懒加载

11
modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
View File

@@ -257,15 +257,21 @@ public class ${ClassName}Controller extends BaseController {
/** /**
* 获取树结构数据 * 获取树结构数据
* @param excludeCode 排除的Code * @param excludeCode 排除的Code
* @param parentCode 设置父级编码返回一级
* @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示） * @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示）
* @return * @return
*/ */
@RequiresPermissions("${permissionPrefix}:view") @RequiresPermissions("${permissionPrefix}:view")
@RequestMapping(value = "treeData") @RequestMapping(value = "treeData")
@ResponseBody @ResponseBody
public List<Map<String, Object>> treeData(String excludeCode, String isShowCode) { public List<Map<String, Object>> treeData(String excludeCode, String parentCode, String isShowCode) {
List<Map<String, Object>> mapList = ListUtils.newArrayList(); List<Map<String, Object>> mapList = ListUtils.newArrayList();
List<${ClassName}> list = ${className}Service.findList(new ${ClassName}()); ${ClassName} where = new ${ClassName}();
where.setStatus(${ClassName}.STATUS_NORMAL);
if (StringUtils.isNotBlank(parentCode)){
where.setParentCode(parentCode);
}
List<${ClassName}> list = ${className}Service.findList(where);
for (int i=0; i<list.size(); i++){ for (int i=0; i<list.size(); i++){
${ClassName} e = list.get(i); ${ClassName} e = list.get(i);
<% if (table.statusExists){ %> <% if (table.statusExists){ %>
@@ -287,6 +293,7 @@ public class ${ClassName}Controller extends BaseController {
map.put("id", e.getId()); map.put("id", e.getId());
map.put("pId", e.getParentCode()); map.put("pId", e.getParentCode());
map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}())); map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}()));
map.put("isParent", !e.getIsTreeLeaf());
mapList.add(map); mapList.add(map);
} }
return mapList; return mapList;

11
modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
View File

@@ -257,15 +257,21 @@ public class ${ClassName}Controller extends BaseController {
/** /**
* 获取树结构数据 * 获取树结构数据
* @param excludeCode 排除的Code * @param excludeCode 排除的Code
* @param parentCode 设置父级编码返回一级
* @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示） * @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示）
* @return * @return
*/ */
@RequiresPermissions("${permissionPrefix}:view") @RequiresPermissions("${permissionPrefix}:view")
@RequestMapping(value = "treeData") @RequestMapping(value = "treeData")
@ResponseBody @ResponseBody
public List<Map<String, Object>> treeData(String excludeCode, String isShowCode) { public List<Map<String, Object>> treeData(String excludeCode, String parentCode, String isShowCode) {
List<Map<String, Object>> mapList = ListUtils.newArrayList(); List<Map<String, Object>> mapList = ListUtils.newArrayList();
List<${ClassName}> list = ${className}Service.findList(new ${ClassName}()); ${ClassName} where = new ${ClassName}();
where.setStatus(${ClassName}.STATUS_NORMAL);
if (StringUtils.isNotBlank(parentCode)){
where.setParentCode(parentCode);
}
List<${ClassName}> list = ${className}Service.findList(where);
for (int i=0; i<list.size(); i++){ for (int i=0; i<list.size(); i++){
${ClassName} e = list.get(i); ${ClassName} e = list.get(i);
<% if (table.statusExists){ %> <% if (table.statusExists){ %>
@@ -287,6 +293,7 @@ public class ${ClassName}Controller extends BaseController {
map.put("id", e.getId()); map.put("id", e.getId());
map.put("pId", e.getParentCode()); map.put("pId", e.getParentCode());
map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}())); map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}()));
map.put("isParent", !e.getIsTreeLeaf());
mapList.add(map); mapList.add(map);
} }
return mapList; return mapList;

11
modules/core/src/main/resources/templates/modules/gen/query/controller.xml
View File

@@ -155,15 +155,21 @@ public class ${ClassName}Controller extends BaseController {
/** /**
* 获取树结构数据 * 获取树结构数据
* @param excludeCode 排除的Code * @param excludeCode 排除的Code
* @param parentCode 设置父级编码返回一级
* @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示） * @param isShowCode 是否显示编码（true or 1：显示在左侧；2：显示在右侧；false or null：不显示）
* @return * @return
*/ */
@RequiresPermissions("${permissionPrefix}:view") @RequiresPermissions("${permissionPrefix}:view")
@RequestMapping(value = "treeData") @RequestMapping(value = "treeData")
@ResponseBody @ResponseBody
public List<Map<String, Object>> treeData(String excludeCode, String isShowCode) { public List<Map<String, Object>> treeData(String excludeCode, String parentCode, String isShowCode) {
List<Map<String, Object>> mapList = ListUtils.newArrayList(); List<Map<String, Object>> mapList = ListUtils.newArrayList();
List<${ClassName}> list = ${className}Service.findList(new ${ClassName}()); ${ClassName} where = new ${ClassName}();
where.setStatus(${ClassName}.STATUS_NORMAL);
if (StringUtils.isNotBlank(parentCode)){
where.setParentCode(parentCode);
}
List<${ClassName}> list = ${className}Service.findList(where);
for (int i=0; i<list.size(); i++){ for (int i=0; i<list.size(); i++){
${ClassName} e = list.get(i); ${ClassName} e = list.get(i);
<% if (table.statusExists){ %> <% if (table.statusExists){ %>
@@ -185,6 +191,7 @@ public class ${ClassName}Controller extends BaseController {
map.put("id", e.getId()); map.put("id", e.getId());
map.put("pId", e.getParentCode()); map.put("pId", e.getParentCode());
map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}())); map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}()));
map.put("isParent", !e.getIsTreeLeaf());
mapList.add(map); mapList.add(map);
} }
return mapList; return mapList;