Merge branch 'activity_2020_12'

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

@@ -135,11 +135,20 @@ public class DegreeController extends BaseController {
 
         Map<String, Object> result = new HashMap<>();
 
+        DegreeRegistration degreeRegistration = degreeRegistrationDao.getWithUserIdAndActivityTag(user.getId(), DegreeRegistrationService.ACTIVITY_TAG);
+
         Student student = studentDao.get(user.getId());
         result.put("userInfo", user);
         result.put("isNewUser", student.getIsNewUser());
         result.put("organs", organizationDao.findAllOrgans());
         result.put("sporadicChargeInfo", sporadicChargeInfoService.queryDetailPage(queryInfo));
+        if(Objects.isNull(degreeRegistration)||degreeRegistration.getStatus()==0){
+            result.put("isApplied", 0);
+        }else if(degreeRegistration.getStatus()==1){
+            result.put("isApplied", 1);
+        }else if(degreeRegistration.getStatus()==2){
+            result.put("isApplied", 2);
+        }
         return succeed(result);
     }
 }