Merge branch 'feature/0427-school' into master_saas

.idea/httpRequests/http-requests-log.http

@@ -2,6 +2,27 @@ POST http://127.0.0.1:8005/open/school/staffSave
 Content-Type: application/json
 coopId: 19
 tenantId: 1
+Content-Length: 127
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{
+  "schoolId": 23,
+  "userType": "ORCHESTRA_LEADER",
+  "username": "小石",
+  "mobile": "15599993302",
+  "smsCode" : 666666
+}
+
+<> 2023-06-01T212120.200.json
+
+###
+
+POST http://127.0.0.1:8005/open/school/staffSave
+Content-Type: application/json
+coopId: 19
+tenantId: 1
 Content-Length: 130
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
@@ -825,21 +846,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:8005/coursePatrolEvaluation/pageStat
-Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
-Content-Type: application/json
-coopId: 12
-Content-Length: 58
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "startTime": "2023-01-01",
-  "endTime": "2024-04-04"
-}
-
-<> 2023-05-29T182738.200.json
-
-###
-

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

@@ -738,6 +738,13 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
 
             schoolStaff.setUserType(schoolStaffUpdate.getUserType());
             this.updateById(schoolStaff);
+
+            // 解除im好友关联
+            imUserFriendDao.deleteByUserIdAndFriendId(schoolStaff.getUserId());
+
+            // 创建学校员工IM好友
+            imUserFriendService.refreshSchoolStaffFriend(schoolStaff.getSchoolId().intValue());
+
             if (schoolStaffUpdate.getUserType().equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
                 addMusicGroup(SchoolStaffWrapper.SchoolStaff.builder()
                         .schoolId(schoolStaff.getSchoolId())