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

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

@@ -194,7 +194,7 @@
                     LEFT JOIN t_salary_account_item l ON l.SALARY_ACCOUNT_ID = a.id and l.JAVA_FIED_NAME = 'relaySalary'
                     WHERE
                     a.DELETE_FLAG = 0
-                    and	a.SEND_MONTH = #{settleMonth}
+                    and	s.SEND_MONTH = #{settleMonth}
                     AND s.STATUS IN (3, 4)
                     GROUP BY a.EMP_IDCARD,a.SALARY_DATE
                 ) b

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

@@ -112,7 +112,8 @@
 				 left join t_salary_employee b on b.id = a.EMP_ID
 				 left join t_salary_account_item annualbonus on annualbonus.SALARY_ACCOUNT_ID = a.id and annualbonus.CN_NAME='年终奖'
 				 left join t_salary_account_item tax on tax.SALARY_ACCOUNT_ID = a.id and tax.CN_NAME='年终奖单独扣税'
-		where a.DELETE_FLAG = '1' and a.SETTLEMENT_MONTH like '${lastYear}%' and annualbonus.SALARY_MONEY > 0 and tax.SALARY_MONEY > 0
+				 left join t_salary_standard s ON s.id = a.SALARY_FORM_ID
+		where a.DELETE_FLAG = '1' and annualbonus.SALARY_MONEY > 0 and tax.SALARY_MONEY > 0 and	s.SEND_MONTH like '${lastYear}%'
 		GROUP BY a.EMP_IDCARD,a.EMP_NAME
 	</select>
 </mapper>