Joburgess 5 年 前
コミット
f508a47795

+ 9 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrganizationRelationController.java

@@ -86,7 +86,15 @@ public class ExamOrganizationRelationController extends BaseController {
     @ApiOperation("发送考级报名链接")
     @PostMapping(value = "/sendUrl")
     public HttpResponseResult sendUrl(Integer examId){
-        examOrganizationRelationService.sendUrl(examId);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(sysUser)){
+            return failed("请重新登录");
+        }
+        Employee employee = employeeService.get(sysUser.getId());
+        if(Objects.isNull(employee)){
+            return failed("用户异常");
+        }
+        examOrganizationRelationService.sendUrl(examId,employee.getOrganId());
         return succeed();
     }
 

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamOrganizationRelationService.java

@@ -61,7 +61,7 @@ public interface ExamOrganizationRelationService extends BaseService<Long, ExamO
      * @param organIds:
      * @return void
      */
-    void sendUrl(Integer examId);
+    void sendUrl(Integer examId, Integer selfOrganId);
 
     /**
      * @describe 获取本单位统计信息

+ 5 - 2
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamOrganizationRelationServiceImpl.java

@@ -287,11 +287,14 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void sendUrl(Integer examId) {
+	public void sendUrl(Integer examId, Integer selfOrganId) {
 		if(Objects.isNull(examId)){
 			throw new BizException("请指定考级项目");
 		}
-		List<ExamOrganizationRelation> examOrgans = examOrganizationRelationDao.getWithExam(examId);
+
+		List<Integer> childOrganIds = organizationService.getChildOrganIds(selfOrganId, true);
+
+		List<ExamOrganizationRelation> examOrgans = examOrganizationRelationDao.getExamOrganizationRelations(examId.longValue(), childOrganIds);
 		Set<Integer> existOrganizationIds = examOrgans.stream().map(ExamOrganizationRelation::getOrganId).collect(Collectors.toSet());
 
 		ExaminationBasic examinationBasic = examinationBasicDao.get(examId.longValue());