Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

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

@@ -77,6 +77,16 @@ public class ExamOrganizationRelationController extends BaseController {
     @ApiOperation("获取未关联到考级项目的合作单位")
     @GetMapping(value = "/queryUnRelatedOrgans")
     public HttpResponseResult<PageInfo<Organization>> queryUnRelatedOrgans(ExamOrganizationRelationQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(Objects.isNull(sysUser)){
+            return failed("请重新登录");
+        }
+        if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
+            Employee employee = employeeService.get(sysUser.getId());
+            if(Objects.nonNull(employee)){
+                queryInfo.setOrganId(employee.getOrganId());
+            }
+        }
         return succeed(examOrganizationRelationService.queryUnRelatedOrgans(queryInfo));
     }
 

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

@@ -309,7 +309,7 @@ public class ExamOrganizationRelationServiceImpl extends BaseServiceImpl<Long, E
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 
-		List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+		List<Integer> nextLevelOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), false);
 		params.put("organIds", nextLevelOrganIds);
 
 		List<Organization> dataList = new ArrayList<>();

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -315,7 +315,6 @@
 			er.organ_id_,
 			er.subject_id_,
 			er.level_,
-			erp.trans_amount_,
 			er.status_,
 			er.create_time_,
 			ersr.exam_room_id_,
@@ -324,7 +323,6 @@
 		FROM
 			exam_registration er
 			LEFT JOIN sys_user su ON er.student_id_ = su.id_
-			LEFT JOIN exam_registration_payment erp ON er.id_ = erp.exam_registration_id_
 			LEFT JOIN exam_room_student_relation ersr ON ersr.exam_registration_id_ = er.id_
 			LEFT JOIN exam_room ero ON ero.id_ = ersr.exam_room_id_
 		<include refid="queryCondition"/>

edu-user/edu-user-server/src/main/resources/config/mybatis/ExaminationBasicMapper.xml

@@ -226,9 +226,9 @@
 	</sql>
 
 	<select id="findExaminationBasics" resultMap="ExaminationBasicDto" parameterType="map">
-		SELECT eb.*
+		SELECT DISTINCT eb.*
 		FROM
-			exam_organization_relation eor
+		exam_organization_relation eor
 		LEFT JOIN examination_basic eb ON eor.examination_basic_id_ = eb.id_
 		<include refid="findExaminationBasicsCondition"/>
 		ORDER BY id_ DESC
@@ -236,7 +236,7 @@
 	</select>
 
 	<select id="countExaminationBasics" resultType="int">
-		SELECT COUNT(eb.id_)
+		SELECT COUNT(DISTINCT eb.id_)
 		FROM
 			exam_organization_relation eor
 		LEFT JOIN examination_basic eb ON eor.examination_basic_id_ = eb.id_