Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git

src/main/java/com/govmade/modules/system/controller/AreaController.java

 package com.govmade.modules.system.controller;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 

src/main/java/com/govmade/modules/system/controller/DepartController.java

 package com.govmade.modules.system.controller;
 
 import java.util.Map;
-import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -64,7 +63,7 @@ public class DepartController extends AbstractController{
 	
 
 	/**
-	 * 批量删除部门
+	 * 删除部门
 	 * 
 	 * @param ids
 	 * @return

src/main/java/com/govmade/modules/system/service/impl/AreaServiceImpl.java

@@ -23,55 +23,53 @@ import cn.hutool.core.util.StrUtil;
  * @date 2018年8月9日
  */
 @Service("AreaService")
-public class AreaServiceImpl extends ServiceImpl<AreaDao,AreaEntity> implements AreaService{
-     
+public class AreaServiceImpl extends ServiceImpl<AreaDao, AreaEntity> implements AreaService {
+
 	@Override
 	public PageTreeUtils queryPage(Map<String, Object> params) {
 		String name = (String) params.get("name");
+
 		int currPage = Integer.parseInt((String) params.get("currPage"));
 		int pageSize = Integer.parseInt((String) params.get("pageSize"));
-		int start = (currPage-1)*pageSize;
+		int start = (currPage - 1) * pageSize;
 		params.put("name2", name);
 		params.put("pageSize2", pageSize);
 		params.put("start", start);
-		List<AreaEntity> allList=this.baseMapper.listTree(params);
-		List<AreaEntity> list=buildAreaTree(allList,0L);
+		List<AreaEntity> allList = this.baseMapper.listTree(params);
+		List<AreaEntity> list = buildAreaTree(allList, 0L);
 		int totalCount = super.selectCount(new EntityWrapper<AreaEntity>().like(StrUtil.isNotBlank(name), "name", name)
 				.eq("pid", 0).eq("state", 1));
-		return new PageTreeUtils(list,totalCount,pageSize,currPage);
+		return new PageTreeUtils(list, totalCount, pageSize, currPage);
+	}
 
-    }
-	
-	
-/**
- *递归方法
- */
-	 private List<AreaEntity> buildAreaTree(List<AreaEntity> areaList, Long id) {
-	        List<AreaEntity> aList = Lists.newArrayList();
+	/**
+	 * 递归方法
+	 */
+	private List<AreaEntity> buildAreaTree(List<AreaEntity> areaList, Long id) {
+		List<AreaEntity> aList = Lists.newArrayList();
+
+		for (AreaEntity area : areaList) {
+			if (id == area.getPid()) {
+				area.setChildren(buildAreaTree(areaList, area.getId()));
+				aList.add(area);
+			}
+		}
+		return aList;
+	}
 
-	        for (AreaEntity area : areaList) {
-	            if (id == area.getPid()) {
-	                area.setChildren(buildAreaTree(areaList, area.getId()));
-	                aList.add(area);
-	            }
-	        }
-	        return aList;
-	    }
-		
-	
 	@Override
 	public void save(AreaEntity area) {
 		super.insertOrUpdate(area);
 	}
-	
+
 	@Override
 	public void deleteBatch(Set<Long> ids) {
 		this.baseMapper.deleteBatch(ids);
 	}
-	
+
 	@Override
 	public Integer checkArea(String name) {
-		return super.selectCount(new EntityWrapper<AreaEntity>().eq("name",name));
+		return super.selectCount(new EntityWrapper<AreaEntity>().eq("name", name));
 	}
-	
+
 }