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

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

@@ -79,7 +79,7 @@ public class SporadicChargeInfoController extends BaseController {
             if (sysUser == null || sysUser.getId() == null) {
                 return failed("用户不存在");
             }
-            if (sysUser.getUserType() != SysUserType.STUDENT) {
+            if (!sysUser.getUserType().contains("STUDENT")) {
                 return failed("用户信息异常");
             }
             sporadicPayDto.setUserId(sysUser.getId());
@@ -106,10 +106,10 @@ public class SporadicChargeInfoController extends BaseController {
         if (sysUser == null || sysUser.getId() == null) {
             return failed("请先登录");
         }
-        if (sysUser.getOrganId() == null || sysUser.getOrganId().isEmpty()) {
+        if (sysUser.getOrganId() == null) {
             return failed("用户信息有误，没有分部信息");
         }
-        Integer organId = Integer.parseInt(sysUser.getOrganId());
+        Integer organId = sysUser.getOrganId();
 
         if (type == null || type <= 0) {
             return failed("参数不合法");