Merge remote-tracking branch 'origin/origin_master' into origin_master

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherService.java

@@ -78,7 +78,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param search
      * @return
      */
-    void queryGroupStudents1(Integer id, String search);
+    List<ImUserFriendDto> queryGroupStudents1(Integer id, String search);
 
     /**
      * 获取教师通讯录学员列表

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImUserFriendServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.ym.mec.biz.service.TeacherService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 
 	@Autowired
 	private ImUserFriendDao imUserFriendDao;
+	@Autowired
+	private TeacherService teacherService;
 
 	@Override
 	public BaseDAO<Long, ImUserFriend> getDAO() {
@@ -73,7 +76,11 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
 
 	@Override
 	public List<ImUserFriendDto> queryFriendListByUserId(Integer userId, String search) {
-		return imUserFriendDao.queryFriendListByUserId(userId, search);
+		List<ImUserFriendDto> imUserFriendDtos = imUserFriendDao.queryFriendListByUserId(userId, search);
+		if(imUserFriendDtos.size() == 0){
+			return teacherService.queryGroupStudents1(userId,search);
+		}
+		return imUserFriendDtos;
 	}
 
 	@Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -239,11 +239,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Transactional(rollbackFor = Exception.class)
-	public void queryGroupStudents1(Integer teacherId, String search) {
-		List<ImUserFriendDto> imUserFriendDtos = imUserFriendDao.queryFriendListByUserId(teacherId, search);
-		if(imUserFriendDtos.size() > 0){
-			return;
-		}
+	public List<ImUserFriendDto> queryGroupStudents1(Integer teacherId, String search) {
 		Set<BasicUserDto> basicUserDtos = new HashSet<>();
 		//学员关联的通讯录
 		//获取相关课程，班级老师列表
@@ -335,7 +331,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(basicUserDtos.size() > 0){
 			//批量新增
 			imUserFriendDao.batchInsert(basicUserDtos,teacherId);
+			return imUserFriendDao.queryFriendListByUserId(teacherId, search);
 		}
+		return new ArrayList<>();
 	}
 
     @Override

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -60,7 +60,6 @@ public class ImGroupController extends BaseController {
 	@ApiOperation("查询群成员列表")
 	@GetMapping(value = "/queryGroupMemberList")
 	public Object queryGroupMemberList(Long imGroupId) {
-
 		return succeed(imGroupService.queryMemberById(imGroupId));
 	}
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -129,16 +129,6 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.queryGroupStudents(sysUser.getId(),search));
     }
 
-    @ApiOperation(value = "同步教师通讯录")
-    @GetMapping("/syncTeacherImFriend")
-    public Object syncTeacherImFriend(){
-        List<Integer> teacherIds = teacherService.queryAllIds();
-        for (Integer teacherId : teacherIds) {
-            teacherService.queryGroupStudents1(teacherId,null);
-        }
-        return succeed();
-    }
-
     @ApiOperation(value = "获取当前教师通讯录学员列表")
     @GetMapping("/queryGroupStudentList")
     public Object queryGroupStudentList(String search){