Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml

@@ -189,7 +189,7 @@
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
            AND user.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">
        <if test="deptid!=null and deptid!=''">
            AND user.dept_id = #{deptid}
        </if>
        GROUP BY
@@ -207,7 +207,7 @@
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
            AND user.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">
        <if test="deptid!=null and deptid!=''">
            AND user.dept_id = #{deptid}
        </if>
        GROUP BY