update

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

@@ -49,9 +49,6 @@ public class StudentExamResultController extends BaseController {
                 queryInfo.setOrganId(employee.getOrganId());
             }
         }
-        if(){
-
-        }
         return succeed(studentExamResultService.queryStudentExamResult(queryInfo));
     }
 

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

@@ -170,6 +170,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 
 	@Override
 	public List<Integer> getNextLevelOrganIds(Integer organId, boolean includeSelf) {
+		if(Objects.isNull(organId)){
+			return null;
+		}
 		Organization organization = organDao.get(organId);
 		if(Objects.isNull(organization)){
 			throw new BizException("当前声部不存在");

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

@@ -132,10 +132,13 @@
 
 	<update id="batchUpdateSendUrlFlag">
 		UPDATE exam_organization_relation SET send_url_flag_=#{sendUrlFlag,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
-		WHERE examination_basic_id_=#{examId} AND organ_id_ IN
-		<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-			#{organId}
-		</foreach>
+		WHERE examination_basic_id_=#{examId}
+		<if test="organIds!=null">
+			AND organ_id_ IN
+			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+				#{organId}
+			</foreach>
+		</if>
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -147,10 +150,12 @@
 		<where>
 			ear.tenant_id_=#{tenantId}
 			AND ear.examination_basic_id_=#{examId}
-			AND ear.organ_id_ IN
-			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-				#{organId}
-			</foreach>
+			<if test="organIds!=null">
+				AND ear.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 			<if test="settlementType!=null">
 				AND ear.settlement_type_=#{settlementType,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -211,11 +216,13 @@
 				LEFT JOIN organization o1 ON o1.id_ = eor1.organ_id_
 			WHERE eor1.examination_basic_id_=#{examId}
 			) eor ON eor.parent_organ_id_tag_ LIKE CONCAT( o.parent_organ_id_tag_, '%' )
-		WHERE
+		<if test="organIds!=null">
+			WHERE
 			o.id_ IN
 			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
 				#{organId}
 			</foreach>
+		</if>
 		GROUP BY o.id_
 	</select>
     <select id="findByOrganId" resultType="java.lang.Integer">

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

@@ -104,10 +104,12 @@
 
 	<sql id="queryCondition">
 		<where>
-			er.organ_id_ IN
-			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-				#{organId}
-			</foreach>
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}
 			</if>
@@ -158,10 +160,13 @@
 		FROM
 			exam_registration er
 		LEFT JOIN exam_room_student_relation ersr ON ersr.student_id_ = er.student_id_
-		WHERE ersr.organ_id_ IN
-		<foreach collection="organIds" item="organI" separator="," open="(" close=")">
-			#{organI}
-		</foreach>
+		WHERE 1=1
+		<if test="organIds!=null">
+			AND ersr.organ_id_ IN
+			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
+				#{organI}
+			</foreach>
+		</if>
 		AND er.examination_basic_id_ = #{examId}
 		AND ersr.id_ IS NULL
 	</select>
@@ -172,10 +177,13 @@
 		FROM
 			exam_room_student_relation ersr
 		LEFT JOIN exam_registration er ON ersr.student_id_ = er.student_id_ AND er.examination_basic_id_=ersr.examination_basic_id_
-		WHERE er.organ_id_ IN
-		<foreach collection="organIds" item="organI" separator="," open="(" close=")">
-			#{organI}
-		</foreach>
+		WHERE 1=1
+		<if test="organIds!=null">
+			er.organ_id_ IN
+			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
+				#{organI}
+			</foreach>
+		</if>
 		AND ersr.examination_basic_id_ = #{examId}
 	</select>
 
@@ -196,10 +204,12 @@
 			exam_registration er
 		WHERE
 			er.examination_basic_id_ = #{examId}
-			AND er.organ_id_ IN
-			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-				#{organId}
-			</foreach>
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
     </select>
 
 	<select id="countTotalRegistrationStudentNumWithExam" resultType="int">
@@ -207,10 +217,13 @@
 			COUNT(er.id_)
 		FROM
 		exam_registration er
-		WHERE er.organ_id_ IN
-		<foreach collection="organIds" item="organI" separator="," open="(" close=")">
-			#{organI}
-		</foreach>
+		WHERE 1=1
+		<if test="organIds!=null">
+			AND er.organ_id_ IN
+			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
+				#{organI}
+			</foreach>
+		</if>
 		AND er.examination_basic_id_ = #{examId}
 		AND er.status_ != ''
 	</select>

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

@@ -90,10 +90,12 @@
 
 	<sql id="findExamResultCondition">
 		<where>
-			ere.organ_id_ IN
-			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-				#{organId}
-			</foreach>
+			<if test="organIds!=null">
+				AND ere.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 			<if test="examinationBaseId!=null">
 				AND ere.examination_basic_id_ = #{examinationBaseId}
 			</if>

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

@@ -162,10 +162,12 @@
 
 	<sql id="queryExamRoomPageSql">
 		<where>
-			er.organ_id_ IN
-			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-				#{organId}
-			</foreach>
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 			<if test="examRoomId!=null">
 				AND er.id_=#{examRoomId}
 			</if>

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

@@ -109,11 +109,13 @@
 
 	<sql id="queryCondition">
 		<where>
-			ersr.organ_id_ IN
-			<foreach collection="organIds" item="organI" separator="," open="(" close=")">
-				#{organI}
-			</foreach>
-			AND er.status_='AUDIT_PASS'
+			er.status_='AUDIT_PASS'
+			<if test="organIds!=null">
+				AND ersr.organ_id_ IN
+				<foreach collection="organIds" item="organI" separator="," open="(" close=")">
+					#{organI}
+				</foreach>
+			</if>
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = 1
 			</if>

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

@@ -99,12 +99,14 @@
 
 	<sql id="queryStudentExamResultCondition">
 		<where>
-			er.organ_id_ IN
-			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-				#{organId}
-			</foreach>
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 			<if test="examId!=null">
-				er.examination_basic_id_ = #{examId}
+				AND er.examination_basic_id_ = #{examId}
 			</if>
 		</where>
 	</sql>
@@ -148,10 +150,12 @@
 			AND er.student_id_ = ser.student_id_
 		WHERE
 			er.examination_basic_id_ = #{examId}
-			AND er.organ_id_ IN
-			<foreach collection="organIds" item="organId" separator="," open="(" close=")">
-				#{organId}
-			</foreach>
+			<if test="organIds!=null">
+				AND er.organ_id_ IN
+				<foreach collection="organIds" item="organId" separator="," open="(" close=")">
+					#{organId}
+				</foreach>
+			</if>
 		GROUP BY
 			er.examination_basic_id_
 	</select>