Merge remote-tracking branch 'origin/develop' into develop

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -272,6 +272,7 @@
 		FROM t_salary_standard a
 		<where>
 			1=1
+			AND a.DELETE_FLAG = 0
 			<if test="tSalaryStandard != null">
 				<if test="tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''">
 					AND a.DEPT_NAME like concat(#{'%',#{tSalaryStandard.deptName},'%')
@@ -283,7 +284,7 @@
 					AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
 				</if>
 				<if test="tSalaryStandard.status == null">
-					AND a.STATUS = 1 OR a.STATUS = 2
+					AND a.STATUS = 1 OR a.STATUS = 2 or a.STATUS = 5
 				</if>
 				<if test="tSalaryStandard.status != null">
 					AND a.STATUS = #{tSalaryStandard.status}