Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml

@@ -43,6 +43,9 @@
        <if test="trainingRegistration.userId!=null and  trainingRegistration.userId!=''">
            and sr.user_id = #{trainingRegistration.userId}
        </if>
        <if test="trainingRegistration.trainUnitName!=null and  trainingRegistration.trainUnitName!=''">
            and bt0.dept_name like concat('%', #{trainingRegistration.trainUnitName},'%')
        </if>
        <if test="trainingRegistration.deptName!=null and  trainingRegistration.deptName!=''">
            and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
        </if>