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

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -314,7 +314,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				TIncomeDetailReturnVo vo = detailR.getData();
 				List<TIncomeDetail> detailList = vo.getDetailList();
 				for (TIncomeDetail incomeDetail : detailList) {
-					value = detailMap.get(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType()
+					value = detailMap.get(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING + incomeDetail.getFeeType()
 							+ CommonConstants.DOWN_LINE_STRING + incomeDetail.getSourceType());
 					if (Common.isEmpty(value)) {
 						value = CommonConstants.ZERO_INT;
@@ -325,6 +326,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 						value--;
 					}
 					detailMap.put(incomeDetail.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING
+							+ incomeDetail.getDeptId() + CommonConstants.DOWN_LINE_STRING
 							+ incomeDetail.getFeeType() + CommonConstants.DOWN_LINE_STRING
 							+ incomeDetail.getSourceType(), value);
 				}