Merge remote-tracking branch 'origin/master'

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

@@ -183,6 +183,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if(StringUtils.isNotEmpty(url)){
 			content += url;
 		}
+		if(StringUtils.isNotEmpty(extra)){
+			content = content + " " + url;
+		}
 		ImPrivateMessage privateMessage = new ImPrivateMessage();
 		privateMessage.setObjectName("RC:TxtMsg");
 		privateMessage.setTargetId(targetIds);

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

@@ -444,7 +444,7 @@
         LEFT JOIN sys_user suc ON suc.id_ = pg.user_id_
         WHERE cs.`group_type_` = 'PRACTICE' AND pg.`group_status_` IN ('NORMAL','FINISH') GROUP BY pg.`student_id_` ) d ON a.student_id_ = d.student_id_
         LEFT JOIN `sys_user` u ON u.`id_` = a.student_id_
-        LEFT JOIN `organization` o ON o.`id_` = a.organ_id_;
+        LEFT JOIN `organization` o ON o.`id_` = a.organ_id_
         <include refid="queryStudentBuysSql"/>
         <include refid="global.limit"/>
     </select>