Merge pull request thinkgem#217 from fengxiang1990/master

更新一些小BUG
sunxiang0918 · Dec 3, 2015 · 55383cc · 55383cc
2 parents 6c5ea82 + b3612e8
commit 55383cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 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)

diff --git a/src/main/resources/mappings/modules/sys/UserDao.xml b/src/main/resources/mappings/modules/sys/UserDao.xml
@@ -111,10 +111,10 @@
     </sql>
 
     <sql id="userJoins">
-		JOIN sys_office c ON c.id = a.company_id
-		JOIN sys_area ca ON ca.id = c.area_id
-		JOIN sys_office o ON o.id = a.office_id
-		JOIN sys_area oa ON oa.id = o.area_id
+		LEFT JOIN sys_office c ON c.id = a.company_id
+		LEFT JOIN sys_area ca ON ca.id = c.area_id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN sys_area oa ON oa.id = o.area_id
 		LEFT JOIN sys_user cu ON cu.id = c.primary_person
 		LEFT JOIN sys_user cu2 ON cu2.id = c.deputy_person
 		LEFT JOIN sys_user ou ON ou.id = o.primary_person