Merge branch 'activity_2020_12'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OrganizationDao.java

@@ -55,4 +55,6 @@ public interface OrganizationDao extends BaseDAO<Integer, Organization> {
 	String getOrganName(String organId);
 	
 	List<Organization> findAllOrgans();
+
+	List<Organization> getActivityOrgans();
 }

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

@@ -143,4 +143,9 @@
             #{organId}
         </foreach>
     </select>
+
+    <select id="getActivityOrgans" resultMap="Organization">
+        SELECT o.* FROM practice_group_sell_price pgsp
+        LEFT JOIN organization o ON pgsp.organ_id_=o.id_
+    </select>
 </mapper>

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

@@ -140,7 +140,7 @@ public class DegreeController extends BaseController {
         Student student = studentDao.get(user.getId());
         result.put("userInfo", user);
         result.put("isNewUser", student.getIsNewUser());
-        result.put("organs", organizationDao.findAllOrgans());
+        result.put("organs", organizationDao.getActivityOrgans());
         result.put("sporadicChargeInfo", sporadicChargeInfoService.queryDetailPage(queryInfo));
         if(Objects.isNull(degreeRegistration)||degreeRegistration.getStatus()==0){
             result.put("isApplied", 0);