Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

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

@@ -31,7 +31,7 @@ public class UploadFileService {
 	private int maxSize;
 
 	/** 支持的扩展名 */
-	@Value("${common.upload.supportExtensions:jpg,jpeg,gif,png,mp3,mid,midi,aac,m4a,mp4,xml,xlsx,xls,doc,docx,txt,pdf,psd,eps}")
+	@Value("${common.upload.supportExtensions:jpg,jpeg,gif,png,mp3,mid,midi,aac,m4a,mp4,xml,xlsx,xls,doc,docx,txt,pdf,psd,eps,rar,zip}")
 	private String supportExtensions;
 
 	/** 文件根目录 */

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

@@ -183,7 +183,7 @@ public class DegreeController extends BaseController {
         result.put("userInfo", user);
         //result.put("isNewUser", student.getIsNewUser());
         
-        SysConfig organConfig = sysConfigDao.findByParamName(SysConfigService.PRACTICE_TEACHER_ORGAN_RANGE);
+        SysConfig organConfig = sysConfigDao.findByParamName("degree_support_organ_list");
         if(StringUtils.isNotEmpty(organConfig.getParanValue())){
             List<Integer> userIds = Arrays.stream(organConfig.getParanValue().split(",")).mapToInt(Integer::valueOf).boxed().collect(Collectors.toList());
             result.put("organs", organizationDao.findOrgans(userIds));