Commit 31ad8778 authored by Fred's avatar Fred

are update

parent bbe8cb75
package com.govmade.modules.system.controller; package com.govmade.modules.system.controller;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
...@@ -10,6 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -10,6 +9,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.govmade.common.utils.PageUtils; import com.govmade.common.utils.PageUtils;
......
package com.govmade.modules.system.controller; package com.govmade.modules.system.controller;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -63,7 +63,7 @@ public class DepartController extends AbstractController{ ...@@ -63,7 +63,7 @@ public class DepartController extends AbstractController{
/** /**
* 批量删除部门 * 删除部门
* *
* @param ids * @param ids
* @return * @return
......
...@@ -32,8 +32,6 @@ public class AreaEntity extends BaseEntity<Long>{ ...@@ -32,8 +32,6 @@ public class AreaEntity extends BaseEntity<Long>{
@TableField(exist=false) @TableField(exist=false)
private List<AreaEntity> children; private List<AreaEntity> children;
public Long getPid() { public Long getPid() {
return pid; return pid;
} }
......
...@@ -28,8 +28,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaDao,AreaEntity> implements ...@@ -28,8 +28,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaDao,AreaEntity> implements
public PageUtils queryPage(Map<String, Object> params) { public PageUtils queryPage(Map<String, Object> params) {
String name = (String) params.get("name"); String name = (String) params.get("name");
List<AreaEntity> allList=this.baseMapper.listTree(name); List<AreaEntity> list=buildAreaTree(this.baseMapper.listTree(name),0);
List<AreaEntity> list=buildAreaTree(allList,0);
Page<AreaEntity> page= new Page<AreaEntity>(); Page<AreaEntity> page= new Page<AreaEntity>();
page.setRecords(list); page.setRecords(list);
return new PageUtils(page); return new PageUtils(page);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment