修改bug

src/main/java/com/qiqiim/webserver/user/controller/ImController.java

@@ -459,8 +459,21 @@ public class ImController extends BaseController {
     public Object getOnlineAdmins(HttpServletResponse response, HttpServletRequest request,
                                   RedirectAttributes redirectAttributes) {
         String deptId = request.getParameter("deptId");
+//        if(deptId != null && !"".equals(deptId)){
+//            deptId = "deptid = " + deptId;
+//        }else{
+//            deptId = "deptid != 2";
+//        }
         if(deptId != null && !"".equals(deptId)){
-            deptId = "deptid = " + deptId;
+            if("路劲太阳城".equals(deptId)){
+                deptId = "deptid = 1";
+            }else if("路劲隽澜湾".equals(deptId)){
+                deptId = "deptid = 3";
+            }else if("路劲隽悦府".equals(deptId)){
+                deptId = "deptid = 4";
+            }else{
+                deptId = "deptid != 2";
+            }
         }else{
             deptId = "deptid != 2";
         }

src/main/java/com/qiqiim/webserver/user/dao/UserDepartmentDao.java

@@ -18,7 +18,7 @@ public interface UserDepartmentDao extends BaseDao<UserDepartmentEntity> {
 	
 	public List<ImFriendUserData> queryGroupAndUser();
 
-	public List<ImFriendUserData> usersQueryGroupAndUser();
+	public List<ImFriendUserData> usersQueryGroupAndUser(@Param("deptId") String deptId);
 
 	public List<ImFriendUserData> usersQueryGroup();
 
@@ -31,4 +31,6 @@ public interface UserDepartmentDao extends BaseDao<UserDepartmentEntity> {
 	public List<ImFriendUserInfoData> adminsGetHistoryUser(@Param("id") long id, @Param("userId") long userId);
 
 	public List<ImFriendUserInfoData> adminsGetAllUser(@Param("id") long id, @Param("allId") String allId);
+
+	public int getUserDept(@Param("id") long id);
 }

src/main/java/com/qiqiim/webserver/user/dao/UserDepartmentDao.xml

@@ -60,7 +60,7 @@
 	</select>
 
 	<select id="usersQueryGroupAndUser" resultMap="userFriendMap">
-		select  id,name as groupname  from user_department where user_department.id != 2
+		select  id,name as groupname  from user_department where ${deptId}
 	</select>
 
 	<select id="usersQueryGroup" resultMap="userFriendMapWithoutCollection2">
@@ -91,6 +91,12 @@
 		where deptid = #{id} ${allId}
 	</select>
 
+	<select id="getUserDept" resultType="java.lang.Integer">
+		select deptid from user_account
+		left join user_info on user_account.id = user_info.uid
+		where user_account.id = #{id}
+	</select>
+
 	<select id="queryList" resultType="com.qiqiim.webserver.user.model.UserDepartmentEntity">
 		select  <include refid="Base_Column_List" />  from user_department
         <choose>

src/main/java/com/qiqiim/webserver/user/service/impl/UserDepartmentServiceImpl.java

@@ -77,7 +77,22 @@ public class UserDepartmentServiceImpl implements UserDepartmentService {
 
     @Override
     public List<ImFriendUserData> usersQueryGroupAndUser(long userId) {
-        List<ImFriendUserData> friendgroup = userDepartmentDao.usersQueryGroupAndUser();
+        String deptId = "";
+        if(userId == 0){
+            deptId = "user_department.id != 2";
+        }else{
+            int did = userDepartmentDao.getUserDept(userId);
+
+            if(did != 0){
+                deptId = String.valueOf(did);
+            }
+            if("".equals(deptId)){
+                deptId = "user_department.id != 2";
+            }else{
+                deptId = "user_department.id = " + deptId;
+            }
+        }
+        List<ImFriendUserData> friendgroup = userDepartmentDao.usersQueryGroupAndUser(deptId);
         for (ImFriendUserData fg : friendgroup) {
             if (userId != 0) {
                 fg.setList(userDepartmentDao.usersQueryUser(fg.getId(), userId));