修复删除没有上级机构的机构时候报空指针的BUG

shylonezeng · Nov 18, 2015 · b3612e8 · b3612e8
1 parent 2d93685
commit b3612e8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/com/thinkgem/jeesite/modules/sys/service/OfficeService.java b/src/main/java/com/thinkgem/jeesite/modules/sys/service/OfficeService.java
@@ -3,6 +3,7 @@
  */
 package com.thinkgem.jeesite.modules.sys.service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -36,8 +37,11 @@ public List<Office> findList(Boolean isAll){
 
 	@Transactional(readOnly = true)
 	public List<Office> findList(Office office){
-		office.setParentIds(office.getParentIds()+"%");
-		return dao.findByParentIdsLike(office);
+		if(office != null){
+			office.setParentIds(office.getParentIds()+"%");
+			return dao.findByParentIdsLike(office);
+		}
+		return  new ArrayList<Office>();
 	}
 
 	@Transactional(readOnly = false)