Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:

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

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

@@ -1,4 +1,282 @@
 POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer e19ed0c6-c024-4378-bf4e-789e0379eab6
+Content-Type: application/json
+Content-Length: 152
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095232.200.json
+
+###
+
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer e19ed0c6-c024-4378-bf4e-789e0379eab6
+Content-Type: application/json
+Content-Length: 152
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095217.200.json
+
+###
+
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+Content-Type: application/json
+Content-Length: 152
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095044.200.json
+
+###
+
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
+Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
+Content-Type: application/json
+Content-Length: 152
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{
+//  "keyword": "宁老师",
+//  "groupType": "SCHOOL",
+  "roleType": "ORCHESTRA_MANAGER",
+  "musicGroupId": "23053118101300001",
+  "lockFlag": false
+}
+
+<> 2023-06-01T095011.200.json
+
+###
+
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+Content-Type: application/json
+Content-Length: 71
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{"coopId":19,"phone":"19900990111","staffId":1839,"userType":"TEACHER"}
+
+<> 2023-05-30T145725.200.json
+
+###
+
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+Content-Type: application/json
+Content-Length: 71
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{"coopId":16,"phone":"19900990111","staffId":1820,"userType":"TEACHER"}
+
+<> 2023-05-30T145417.200.json
+
+###
+
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+Content-Type: application/json
+Content-Length: 71
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{"coopId":16,"phone":"19900990111","staffId":1837,"userType":"TEACHER"}
+
+<> 2023-05-30T145329.200.json
+
+###
+
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
+Content-Type: application/json
+Content-Length: 71
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
+
+<> 2023-05-30T144905.200.json
+
+###
+
+POST http://127.0.0.1:8005/schoolStaff/updateAccount
+Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
+Content-Type: application/json
+Content-Length: 71
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
+
+<> 2023-05-30T144848.200.json
+
+###
+
+POST http://127.0.0.1:8005/open/school/staffSave
+Content-Type: application/json
+coopId: 19
+tenantId: 1
+Content-Length: 129
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+{
+  "schoolId": 3,
+  "userType": "ORCHESTRA_LEADER",
+  "username": "测试113",
+  "mobile": "19900990114",
+  "smsCode" : 666666
+}
+
+<> 2023-05-29T183339.200.json
+
+###
+
+GET http://127.0.0.1:8005/imGroup/queryGroupMemberList?imGroupId=62
+Content-Type: application/json
+Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-29T182845.200.json
+
+###
+
+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
+
+###
+
+POST http://127.0.0.1:8005/coursePatrolEvaluation/pageStat
+Authorization: bearer 703c9711-ca6d-45c3-9583-34d7b9d86705
+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-29T182713.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T181738.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T181606.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T180935.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 66862b1d-938b-467e-b7c9-65f77f0e7347
+tenantId: 1
+coopId: 14
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T180923.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolStaff/cooperation
+Authorization: bearer 3f804d4e-b7f0-41ad-8dbf-119a0c54becc
+tenantId: 1
+coopId: 1
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-05-25T180355.200.json
+
+###
+
+POST http://127.0.0.1:8005/imGroup/schoolQueryFriendList
 Authorization: bearer 07bef4ad-6d9e-46e0-8fd3-c24a2fd11332
 Content-Type: application/json
 Content-Length: 155
@@ -372,7 +650,7 @@ Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
 Accept-Encoding: br,deflate,gzip,x-gzip
 
-<> 2023-05-18T145937.200.json
+<> 2023-05-19T170850.200.json
 
 ###
 
@@ -385,569 +663,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorFingerprint?code=0413aiGa1MplkF0RyGGa1sf6S143aiGv
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-18T145309.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/sysConfig/queryByParamName?paramName=wechat_appid
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-17T183050.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 82
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248324-1683860932420", "excludeBlacklist": 0}
-
-<> 2023-05-12T191018.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 82
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248324-1683860932420", "excludeBlacklist": 1}
-
-<> 2023-05-12T191000.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T190114.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T185307.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T184904.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T184725.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T184519.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T184412.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T183529.200.json
-
-###
-
-POST http://127.0.0.1:8005/imLiveBroadcastRoomMember/queryRoomMember
-Content-Type: application/json
-Authorization: bearer 70c30cec-f77c-4871-beaa-ce4b5224bf3e
-Content-Length: 59
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"rows":10,"page":1,"roomUid":"LIVE-2248475-1683777517444"}
-
-<> 2023-05-12T183456.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorRoomInfo?roomUid=LIVE-2248475-1683777517444&userId=10001
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204659.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111112
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204644.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorJoinRoom?roomUid=LIVE-2248475-1683777517444&userId=10000
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204620.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorRoomInfo?roomUid=LIVE-2248475-1683777517444&userId=10000
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204529.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T204510.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111112
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T203037.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T203024.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T203016.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T202954.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T202704.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T202141.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T202117.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorJoinRoom?roomUid=LIVE-2248475-1683777517444&userId=10000
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T201906.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorRoomInfo?roomUid=LIVE-2248475-1683777517444&userId=10000
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T201829.200.json
-
-###
-
-GET http://127.0.0.1:9001/open/liveBroadcastRoom/visitorCredentials?roomUid=LIVE-2248475-1683777517444&fingerprint=111111111
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-11T201306.200.json
-
-###
-
-POST http://127.0.0.1:8005/open/school/staffSave
-Content-Type: application/json
-Content-Length: 127
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "李四",
-  "mobile": "18682475902",
-  "smsCode": "666666"
-}
-
-<> 2023-05-10T212648.200.json
-
-###
-
-POST http://127.0.0.1:8005/open/school/staffSave
-Content-Type: application/json
-Content-Length: 104
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "李四",
-  "mobile": "18682475902"
-}
-
-<> 2023-05-10T212627.200.json
-
-###
-
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer ae333169-e0f2-4fc3-adc1-08048fd77196
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T202004.200.json
-
-###
-
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer ae333169-e0f2-4fc3-adc1-08048fd77196
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T201748.200.json
-
-###
-
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer ae333169-e0f2-4fc3-adc1-08048fd77196
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T201724.200.json
-
-###
-
-POST http://127.0.0.1:8001/smsLogin?clientId=EDUCATION&clientSecret=EDUCATION&deviceNum=&phone=18682475952&smsCode=666666
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 2
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{}
-
-<> 2023-05-10T201707.200.json
-
-###
-
-POST http://127.0.0.1:8001/smsLogin?clientId=EDUCATION&clientSecret=EDUCATION&deviceNum=&phone=18682475901&smsCode=666666
-Content-Type: application/x-www-form-urlencoded
-Content-Length: 2
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{}
-
-<> 2023-05-10T201654.200.json
-
-###
-
-GET http://127.0.0.1:8005/schoolStaff/cooperation
-Authorization: bearer 7d12c468-e8cf-4e81-bc56-a9de18ba8fc5
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T201550.200.json
-
-###
-
-POST http://127.0.0.1:8005/open/school/staffSave
-Content-Type: application/json
-Content-Length: 104
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "李四",
-  "mobile": "18682475902"
-}
-
-<> 2023-05-10T155616.200.json
-
-###
-
-POST http://127.0.0.1:8005/open/school/staffSave
-Content-Type: application/json
-Content-Length: 104
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "李四",
-  "mobile": "18682475902"
-}
-
-<> 2023-05-10T154304.200.json
-
-###
-
-POST http://127.0.0.1:8005/open/school/staffSave
-Content-Type: application/json
-Content-Length: 104
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "李四",
-  "mobile": "18682475902"
-}
-
-<> 2023-05-10T154238.200.json
-
-###
-
-POST http://127.0.0.1:8005/open/school/staffSave
-Content-Type: application/json
-Content-Length: 104
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "李四",
-  "mobile": "18682475902"
-}
-
-<> 2023-05-10T154216.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T153150.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T152508.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T152417.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T152236.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T152033.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T151724.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T151501.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-tenantid: 1
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T151443.200.json
-
-###
-
-GET http://127.0.0.1:8006/news/list?type=29
-Authorization: bearer e50cd2ae-3fad-4b3a-93ce-c86689cae2dc
-Proxy-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-<> 2023-05-10T151238.200.json
-
-###
-

mec-biz/src/main/java/com/ym/mec/biz/dal/school/dto/TeacherAttendanceSumDto.java

@@ -26,8 +26,8 @@ public class TeacherAttendanceSumDto {
     private TeacherAttendanceQueryInfo.TeacherAttendanceEnum teacherAttendanceStatus = TeacherAttendanceQueryInfo.TeacherAttendanceEnum.NO_COURSE;
 
     @ApiModelProperty(value = "本学期异常考勤课程数")
-    private Integer errCourseNum;
+    private Integer errCourseNum = 0;
 
     @ApiModelProperty(value = "本学期总课程数")
-    private Integer totalCourseNum;
+    private Integer totalCourseNum = 0;
 }

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

@@ -119,6 +119,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
     @Autowired
+    private CourseScheduleModifyLogService courseScheduleModifyLogService;
+    @Autowired
     private StudentApplyRefundsDao studentApplyRefundsDao;
     @Autowired
     private RedisCache<String, Object> redisCache;
@@ -2528,8 +2530,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             imUserFriendService.refreshClassImUserFriend(classGroupId);
             // 通知学校端
-
-
             for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
                 if (CollectionUtils.isEmpty(classGroup4MixDto.getClassGroupTeacherMapperList())) {
                     continue;
@@ -2769,12 +2769,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             //学生结算表
             courseScheduleStudentPaymentService.createForMusicGroup(musicGroupId, courseScheduleList, studentIds);
         }
+        //学校端推送
+        courseScheduleModifyLogService.pushSchoolCourseCreate(courseScheduleList.get(0),musicGroup);
         if (musicGroup.getStatus() == PROGRESS) {
             imUserFriendService.refreshClassImUserFriend(classGroupId);
         }
-
-
-
         return BaseController.succeed(classGroup);
     }
 

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

@@ -506,6 +506,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             log.error("添加群成员失败{}", imGroup.getId(), e);
         }
         imGroupMemberDao.batchInsert(imGroupMemberList);
+        updateImGroupUserNumber(imGroup.getId());
     }
 
 
@@ -637,11 +638,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      */
     @Override
     public List<ImGroup> queryByUserId(ImGroupWrapper.ImQuery query) {
-        if (query.getGroupType() != null && StringUtils.isNotBlank(query.getMusicGroupId())) {
-            if (query.getGroupType().equals(ImGroup.GroupTypeEnum.SCHOOL)) {
-                return new ArrayList<>();
-            }
-        }
         return imGroupDao.getByUserId(query);
     }
 
@@ -705,7 +701,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
 
         // 查询群是否存在
-        ImGroup imGroup = imGroupDao.queryBySchoolId(cooperationOrganId.longValue());
+        ImGroup imGroup = imGroupDao.get(imGroupId);
         if (imGroup == null) {
             return;
         }

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

@@ -223,7 +223,7 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
                 usernameMap = MapUtil.convertMybatisMap(teacherDao.queryUserNameByIdList(new ArrayList<>(studentIds)));
             }
             Set<Integer> educationIds = new HashSet<>();
-            educationIds.add(musicGroup.getTeamTeacherId());
+            educationIds.add(musicGroup.getEducationalTeacherId());
 
             //学校乐团领队关联 乐团管理人员、教务、学员
 
@@ -290,11 +290,6 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
      */
     @Override
     public List<ImUserFriendDto> queryFriendListByUserId(ImGroupWrapper.ImQuery query) {
-        if (StringUtils.isNotBlank(query.getRoleType()) && StringUtils.isNotBlank(query.getMusicGroupId())) {
-            if (!query.getRoleType().equals("STUDENT")) {
-                return new ArrayList<>();
-            }
-        }
         return imUserFriendDao.getFriendListByUserId(query);
 
     }

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

@@ -1662,7 +1662,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         groupEventSource.musicGroupStudentChangeEvent(musicGroupId, StudentMusicGroupStatusEnum.NORMAL, null);
 
         ImGroupMemberWrapper.ImGroupMember build = ImGroupMemberWrapper.ImGroupMember.builder()
-                .userId(musicGroup.getTeamTeacherId().longValue())
+                .userId(musicGroup.getEducationalTeacherId().longValue())
                 .roleType(EFriendRoleType.ORCHESTRA_MANAGER.getMsg())
                 .build();
         // 乐团主管加入学校群聊

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

@@ -19,11 +19,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.ym.mec.biz.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -129,31 +131,6 @@ import com.ym.mec.biz.dal.page.RegistrationOrPreQueryInfo;
 import com.ym.mec.biz.dal.page.StudentPreRegistrationQueryInfo;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.biz.event.source.SendSeoMessageSource;
-import com.ym.mec.biz.service.ClassGroupService;
-import com.ym.mec.biz.service.ClassGroupStudentMapperService;
-import com.ym.mec.biz.service.CloudTeacherOrderService;
-import com.ym.mec.biz.service.ContractService;
-import com.ym.mec.biz.service.CourseScheduleService;
-import com.ym.mec.biz.service.CourseScheduleStudentPaymentService;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.biz.service.ImGroupMemberService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderActivityService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderMemberService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderRepairService;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
-import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
-import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.StudentService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.SysCouponCodeService;
-import com.ym.mec.biz.service.SysMessageService;
-import com.ym.mec.biz.service.SysTenantConfigService;
-import com.ym.mec.biz.service.SysUserCashAccountDetailService;
-import com.ym.mec.biz.service.SysUserCashAccountLogService;
-import com.ym.mec.biz.service.SysUserCashAccountService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.ImResult;
@@ -274,6 +251,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Autowired
     private MusicGroupPaymentCalenderRepairService musicGroupPaymentCalenderRepairService;
 
+    @Autowired
+    private ImUserFriendService imUserFriendService;
+
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
         return studentRegistrationDao;
@@ -640,6 +620,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_APPLY_MESSAGE, map, null, 0, "", "",
                 studentRegistration.getParentsName(), subject.getName(), serverPhone);
 
+        // 刷新im
+        imUserFriendService.refreshGroupImUserFriend(studentRegistration.getMusicGroupId(), null);
+
         return studentRegistration;
     }
 
@@ -1286,6 +1269,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     musicGroupStudentFeeDao.insert(musicGroupStudentFee);
                 }
             }
+
+            // 刷新im
+            imUserFriendService.refreshGroupImUserFriend(studentRegistration.getMusicGroupId(), null);
+
             //主班新增余额日志
             if (amount.doubleValue() != 0d && masterTotalPrice.doubleValue() > 0d) {
                 StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();

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

@@ -314,8 +314,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
             this.sendGroupMessage(imMessageDto);
         }
         if (StringUtils.isNotBlank(messageDto.getUserTargetIds())) {
+            String targetIds = messageDto.getTargetIds();
             messageDto.setTargetIds(messageDto.getUserTargetIds());
             ImMessageDto imMessageDto = this.getImGroupMessage(messageDto);
+            messageDto.setTargetIds(targetIds);
             imMessageDto.setMessageContent(imageToBase64(bufferedImage, "png"));
             imMessageDto.setFileUrl(messageDto.getFileUrl());
             this.sendImMessage(imMessageDto);

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

@@ -1216,33 +1216,39 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				List<TeacherAttendanceWrapper.CourseTeacherAttendance> attendances = attendanceMap.get(dto.getTeacherId());
 				if(CollectionUtils.isNotEmpty(attendances)){
 					dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.NORMAL);
+					int errCourseNum = 0;
 					att:for (TeacherAttendanceWrapper.CourseTeacherAttendance attendance : attendances) {
 						if(attendance.getCourseStatus() == CourseStatusEnum.NOT_START){
 							continue att;
 						}
 						if(attendance.getSignInStatus() == 0 || attendance.getSignOutStatus() == 0){
 							dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
-							break att;
+							errCourseNum++;
+							continue att;
 						}
 						if(attendance.getTeachMode() == TeachModeEnum.OFFLINE){
 							if(StringUtils.isEmpty(attendance.getSignInLongitudeLatitude()) || StringUtils.isEmpty(attendance.getSignOutLongitudeLatitude())){
+								errCourseNum++;
+							}else {
 								//计算考勤范围
 								School school = idSchoolMap.get(attendance.getSchoolId());
 								if(school != null){
 									Boolean signRange = courseScheduleTeacherSalaryService.getSignRange(school.getLongitudeLatitude(), attendance.getSignInLongitudeLatitude(), attendanceRange);
 									if(!signRange){
 										dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
-										break att;
+										errCourseNum++;
+										continue att;
 									}
 									signRange = courseScheduleTeacherSalaryService.getSignRange(school.getLongitudeLatitude(), attendance.getSignOutLongitudeLatitude(), attendanceRange);
 									if(!signRange){
 										dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
-										break att;
+										errCourseNum++;
 									}
 								}
 							}
 						}
 					}
+					dto.setErrCourseNum(errCourseNum);
 				}
 			}
 			if(queryInfo.getTeacherAttendanceStatus() != null){

mec-biz/src/main/resources/config/mybatis/ImUserFriendMapper.xml

@@ -173,9 +173,12 @@
         LEFT JOIN student st ON st.user_id_ = u.id_
         left join student_registration cgs on cgs.user_id_ = st.user_id_
         LEFT JOIN `subject` s ON s.id_ = st.subject_id_list_
+        <if test="param.musicGroupId != null and param.musicGroupId != ''">
+            left join music_group mg on mg.id_ = #{param.musicGroupId}
+        </if>
         WHERE iuf.user_id_ = #{param.userId}
         <if test="param.keyword != null and param.keyword != ''">
-            and (u.real_name_ like concat('%',#{param.keyword},'%') or iuf.friend_nickname_ like concat('%',#{param.keyword},'%'))
+            and (iuf.friend_nickname_ like concat('%',#{param.keyword},'%'))
         </if>
 
         <if test="param.musicGroupId != null and param.musicGroupId != ''">
@@ -183,6 +186,9 @@
         </if>
         <if test="param.roleType != null and param.roleType != ''">
             and iuf.role_type_ = #{param.roleType}
+            <if test="param.musicGroupId != null and param.musicGroupId != ''">
+                and mg.educational_teacher_id_ = iuf.friend_id_
+            </if>
         </if>
         <if test="param.lockFlag != null and !param.lockFlag">
             and u.lock_flag_ = 0

mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -628,11 +628,9 @@
     </select>
     <select id="queryTeacherAttendance" resultType="com.ym.mec.biz.dal.school.dto.TeacherAttendanceSumDto">
         select cg.type_ classGroupType,cs.actual_teacher_id_ teacherId,COUNT(distinct cs.id_) totalCourseNum,
-               COUNT(CASE WHEN ta.sign_in_status_ = 1 and ta.sign_in_status_ = 1 THEN NULL ELSE 1 END) errCourseNum,
                cs.class_group_id_ classGroupId,su.avatar_ teacherAvatar,su.real_name_ teacherName
         from course_schedule cs
         left join class_group cg ON cg.id_ = cs.class_group_id_
-        left join teacher_attendance ta ON ta.course_schedule_id_ = cs.id_ AND ta.teacher_id_ = cs.actual_teacher_id_
         left join sys_user su ON su.id_ = cs.actual_teacher_id_
         <include refid="queryTeacherAttendanceSql"/>
         group by cs.actual_teacher_id_

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

@@ -72,7 +72,7 @@ public class ImGroupController extends BaseController {
 			dto = new ImUserFriendDto();
 			SysUser user = sysUserService.queryUserById(userId);
 			dto.setFriend(user);
-			if (user.getUserType().contains("STUDENT")) {
+			if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {
 				dto.setFriendNickname(user.getRealName());

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

@@ -93,7 +93,7 @@ public class ImGroupController extends BaseController {
 			dto = new ImUserFriendDto();
 			SysUser user = userLoginService.queryUserById(userId);
 			dto.setFriend(user);
-			if (user.getUserType().contains("STUDENT")) {
+            if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {
 				dto.setFriendNickname(user.getRealName());

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

@@ -115,7 +115,7 @@ public class ImGroupController extends BaseController {
 			dto.setFriend(user);
 			//这里由原来的优先取老师的realName改成了优先取学员的username，
 			// 因为管理员在修改通讯录备注的时候，如果是多角色，优先改的是学员的username
-			if (user.getUserType().contains("STUDENT")) {
+            if (user.getUserType().contains("STUDENT") || user.getUserType().contains("SCHOOL")) {
 				dto.setFriendNickname(user.getUsername());
 			} else {
 				dto.setFriendNickname(user.getRealName());