update

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

@@ -6,34 +6,28 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
-import com.ym.mec.biz.dal.dto.SporadicPayDto;
 import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 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;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RequestMapping("degree")
 @Api(tags = "考级报名服务")
@@ -178,13 +172,15 @@ public class DegreeController extends BaseController {
 
         Map<String, Object> result = new HashMap<>();
 
-        Student student = studentDao.get(user.getId());
+//        Student student = studentDao.get(user.getId());
         result.put("userInfo", user);
         //result.put("isNewUser", student.getIsNewUser());
         
         SysConfig organConfig = sysConfigDao.findByParamName(SysConfigService.PRACTICE_TEACHER_ORGAN_RANGE);
-        
-        result.put("organs", organConfig.getParanValue());
+        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));
+        }
         result.put("sporadicChargeInfo", sporadicChargeInfoService.queryDetailPage(queryInfo));
 
         List<DegreeRegistration> userLevelDegrees = degreeRegistrationDao.getUserLevelDegrees(user.getId(), DegreeRegistrationService.ACTIVITY_TAG);