update

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

@@ -15,13 +15,16 @@ import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
 import com.ym.mec.biz.service.DegreeRegistrationService;
 import com.ym.mec.biz.service.SporadicChargeInfoService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.idcard.IdcardValidator;
 import com.ym.mec.util.validator.CommonValidator;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -54,6 +57,9 @@ public class DegreeController extends BaseController {
 
     @Autowired
     private StudentDao studentDao;
+    
+    @Autowired
+    private SysConfigDao sysConfigDao;
 
     @Autowired
     private OrganizationDao organizationDao;
@@ -86,8 +92,8 @@ public class DegreeController extends BaseController {
             degreeRegistration.setOrganId(user.getOrganId());
         }
 
-        if(Objects.isNull(degreeRegistration.getOrganId()) || degreeRegistration.getOrganId() != 40){
-            return failed("该分部暂未参与此活动");
+        if(Objects.isNull(degreeRegistration.getOrganId()) || degreeRegistration.getOrganId() == 4){
+            return failed("该分部暂未开放此活动");
         }
 
         return degreeRegistrationService.pay(degreeRegistration);
@@ -111,8 +117,8 @@ public class DegreeController extends BaseController {
             degreeRegistration.setOrganId(user.getOrganId());
         }
 
-        if(Objects.isNull(degreeRegistration.getOrganId()) || degreeRegistration.getOrganId() != 40){
-            return failed("该分部暂未参与此活动");
+        if(Objects.isNull(degreeRegistration.getOrganId()) || degreeRegistration.getOrganId() == 4){
+            return failed("该分部暂未开放此活动");
         }
 
         return degreeRegistrationService.theoryPay(degreeRegistration);
@@ -174,8 +180,11 @@ public class DegreeController extends BaseController {
 
         Student student = studentDao.get(user.getId());
         result.put("userInfo", user);
-        result.put("isNewUser", student.getIsNewUser());
-        result.put("organs", organizationDao.getActivityOrgans());
+        //result.put("isNewUser", student.getIsNewUser());
+        
+        SysConfig organConfig = sysConfigDao.findByParamName(SysConfigService.PRACTICE_TEACHER_ORGAN_RANGE);
+        
+        result.put("organs", organConfig.getParanValue());
         result.put("sporadicChargeInfo", sporadicChargeInfoService.queryDetailPage(queryInfo));
 
         List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(user.getId(), DegreeRegistrationService.ACTIVITY_TAG);