新增两个部门

修改没有聊天记录依然显示游客的bug

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

@@ -189,7 +189,7 @@ public class ImController extends BaseController {
             //获取用户分组 及用户
             List<ImFriendUserData> friends = new ArrayList<>();
             //管理员列表即为与其有过聊天记录的用户
-            if (user.getDeptid() == 1) {
+            if (user.getDeptid() != 2) {
                 friends = userDepartmentServiceImpl.adminsQueryGroupAndUser(user.getUid());
             } else {
                 Long l = (Long) request.getSession().getAttribute("wantedId");
@@ -251,7 +251,11 @@ public class ImController extends BaseController {
                     allId += "uid != " + imFriendUserInfoData.getId() + " and ";
                 }
             }
-            list.get(0).getList().addAll(userDepartmentServiceImpl.adminsQueryGroupAndUser2(allId).get(0).getList());
+            if(list.get(0).getList().size() == 0){
+                list.get(0).setList(userDepartmentServiceImpl.adminsQueryGroupAndUser2(allId).get(0).getList());
+            }else{
+                list.get(0).getList().addAll(userDepartmentServiceImpl.adminsQueryGroupAndUser2(allId).get(0).getList());
+            }
             map.put("friend", list);
             us.setData(map);
             return JSONArray.toJSON(us);
@@ -452,8 +456,15 @@ public class ImController extends BaseController {
 
     @RequestMapping(value = "/Main")
     @ResponseBody
-    public Object getOnlineAdmins() {
-        List<Long> allAdminId = userInfoServiceImpl.getAllAdminId();
+    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";
+        }
+        List<Long> allAdminId = userInfoServiceImpl.getAllAdminId(deptId);
         Session[] sessions = sessionManager.getSessions();
         List<Session> list = Arrays.asList(sessions);
         List<UserAdminInfoEntity> resultList = userAdminInfoServiceImpl.sortOnlineAdmin(allAdminId);

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

@@ -60,11 +60,11 @@
 	</select>
 
 	<select id="usersQueryGroupAndUser" resultMap="userFriendMap">
-		select  id,name as groupname  from user_department where user_department.id = 1
+		select  id,name as groupname  from user_department where user_department.id != 2
 	</select>
 
 	<select id="usersQueryGroup" resultMap="userFriendMapWithoutCollection2">
-		select  id,name as groupname  from user_department where user_department.id = 1
+		select  id,name as groupname  from user_department where user_department.id != 2
 	</select>
 
 	<select id="usersQueryUser" resultType="com.qiqiim.webserver.user.model.ImFriendUserInfoData">
@@ -77,7 +77,7 @@
 	</select>
 
 	<select id="adminsQueryGroupAndUser" resultMap="userFriendMapWithoutCollection">
-		select  id,name as groupname  from user_department where id != 1
+		select  id,name as groupname  from user_department where id = 2
 	</select>
 
 	<select id="adminsGetHistoryUser" resultType="com.qiqiim.webserver.user.model.ImFriendUserInfoData">
@@ -88,7 +88,7 @@
 
 	<select id="adminsGetAllUser" resultType="com.qiqiim.webserver.user.model.ImFriendUserInfoData">
 		select  DISTINCT uid   as id ,name as username , signature as sign  ,  profilephoto as avatar     from user_info
-		where deptid = #{id} and ${allId}
+		where deptid = #{id} ${allId}
 	</select>
 
 	<select id="queryList" resultType="com.qiqiim.webserver.user.model.UserDepartmentEntity">

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

 package com.qiqiim.webserver.user.dao;
 import com.qiqiim.webserver.base.dao.BaseDao;
 import com.qiqiim.webserver.user.model.UserInfoEntity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,5 +16,5 @@ public interface UserInfoDao extends BaseDao<UserInfoEntity> {
 
     int deleteLongTimeInfo(List<Long> list);
 
-    List getAllAdminId();
+    List getAllAdminId(@Param(value = "deptId") String deptId);
 }

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

@@ -79,7 +79,7 @@
 	</select>
 
     <select id="getAllAdminId" resultType="long">
-        select uid from user_info where deptid = 1
+        select uid from user_info where ${deptId}
     </select>
 	 
 	<insert id="save" parameterType="com.qiqiim.webserver.user.model.UserInfoEntity" useGeneratedKeys="true" keyProperty="id">

src/main/java/com/qiqiim/webserver/user/service/UserInfoService.java

@@ -28,5 +28,5 @@ public interface UserInfoService {
 	
 	int deleteBatch(Long[] ids);
 
-	List getAllAdminId();
+	List getAllAdminId(String deptId);
 }

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

@@ -52,7 +52,9 @@ public class UserAccountServiceImpl implements UserAccountService {
 				UserInfoEntity userInfo = userAccount.getUserInfo();
 				userInfo.setUid(userAccount.getId());
 				userInfoServiceImpl.save(userInfo);
-				userAdminInfoService.save(userAccount.getId());
+				if(userAccount.getUserInfo().getDeptid() != 2){
+					userAdminInfoService.save(userAccount.getId());
+				}
 			}
 		} 
 	}

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

@@ -116,6 +116,9 @@ public class UserDepartmentServiceImpl implements UserDepartmentService {
     @Override
     public List<ImFriendUserData> adminsQueryGroupAndUser2(String allId) {
         List<ImFriendUserData> friendgroup = userDepartmentDao.adminsQueryGroupAndUser();
+        if(allId != null && !"".equals(allId)){
+            allId = " and " + allId;
+        }
         for (ImFriendUserData fg : friendgroup) {
             List<ImFriendUserInfoData> friends = userDepartmentDao.adminsGetAllUser(fg.getId(), allId);
             fg.setList(friends);

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

@@ -53,8 +53,8 @@ public class UserInfoServiceImpl implements UserInfoService {
 	}
 
 	@Override
-	public List<Long> getAllAdminId() {
-		return userInfoDao.getAllAdminId();
+	public List<Long> getAllAdminId(String deptId) {
+		return userInfoDao.getAllAdminId(deptId);
 	}
 
 }

src/main/java/com/qiqiim/webserver/user/timer/DeleteUserTimer.java

@@ -39,11 +39,11 @@ public class DeleteUserTimer {
 
     private final static Logger log = LoggerFactory.getLogger(DeleteUserTimer.class);
 
-    @Scheduled(cron = "30 * * * * ?" )
+    @Scheduled(cron = "0 0 * * * ?" )
     public void deleteLongTimeUser(){
 
         log.info("----------------------------------统计员工工作情况----------------------------------");
-        List adjustList = userInfoDao.getAllAdminId();
+        List adjustList = userInfoDao.getAllAdminId("deptid != 2");
         int updateNum = userAdminInfoDao.updateAdminInfo(adjustList);
         log.info(">> 更新了 " + updateNum + "条员工信息");
         log.info("----------------------------------统计员工工作完成----------------------------------");

src/main/webapp/WEB-INF/page/layim.jsp

@@ -254,7 +254,7 @@
                                 success:function(data){
                                     // console.log("data",data);
                                     // console.log("data.friend",data.data.friend);
-                                    if(data.data.deptId == 1){
+                                    if(data.data.deptId != 2){
                                         cache.friend = data.data.friend;
                                     }
 

src/main/webapp/WEB-INF/page/layimmobile.jsp

@@ -239,7 +239,7 @@ layui.config({
                           success:function(data){
                               // console.log("data",data);
                               // console.log("data.friend",data.data.friend);
-                              if(data.data.deptId == 1){
+                              if(data.data.deptId != 2){
                                   cache.friend = data.data.friend;
                               }
 

src/main/webapp/manager.jsp

@@ -52,7 +52,9 @@
                       <label class="layui-form-label">所在部门</label>
                       <div class="layui-input-block">
                           <select name="userInfo.deptid" lay-verify="required">
-                              <option value="1">客服</option>
+                              <option value="1">路劲太阳城置业顾问</option>
+                              <option value="3">路劲隽澜湾置业顾问</option>
+                              <option value="4">路劲武清置业顾问</option>
                           </select>
                       </div>
                   </div>