fix: 后端对非劳动合同类型 socialInsBase/housingFundBase 返回 null

不再在数据源头返回社保基数和公积金基数,而非前端隐藏
This commit is contained in:
freedakgmail
2026-08-17 20:27:19 +08:00
parent f242a592bb
commit 152b0b5024
2 changed files with 11 additions and 7 deletions
+10 -2
View File
@@ -222,8 +222,16 @@ router.get('/', authMiddleware, async (req: AuthRequest, res, next) => {
monthlySalary: safeDecrypt(e.monthlySalary), monthlySalary: safeDecrypt(e.monthlySalary),
baseSalary: e.baseSalary ? safeDecrypt(e.baseSalary) : null, baseSalary: e.baseSalary ? safeDecrypt(e.baseSalary) : null,
performanceSalary: e.performanceSalary ? safeDecrypt(e.performanceSalary) : null, performanceSalary: e.performanceSalary ? safeDecrypt(e.performanceSalary) : null,
socialInsBase: e.socialInsBase, socialInsBase: (() => {
housingFundBase: e.housingFundBase, const ct = latestContract?.contractType
if (!ct || ['LABOR', 'INTERNSHIP', 'PARTTIME', 'OUTSOURCING', 'UNSIGNED'].includes(ct)) return null
return e.socialInsBase
})(),
housingFundBase: (() => {
const ct = latestContract?.contractType
if (!ct || ['LABOR', 'INTERNSHIP', 'PARTTIME', 'OUTSOURCING', 'UNSIGNED'].includes(ct)) return null
return e.housingFundBase
})(),
socialInsCalc: (() => { socialInsCalc: (() => {
const contractType = latestContract?.contractType const contractType = latestContract?.contractType
// 劳务协议、实习协议、兼职协议、业务外包等非劳动合同不缴纳社保 // 劳务协议、实习协议、兼职协议、业务外包等非劳动合同不缴纳社保
+1 -5
View File
@@ -917,11 +917,7 @@ export default function Roster() {
})()} })()}
</td>} </td>}
{colVisible('socialInsBase') && <td className="px-4 py-2.5 text-right text-xs"> {colVisible('socialInsBase') && <td className="px-4 py-2.5 text-right text-xs">
{(() => { {e.socialInsBase ? e.socialInsBase.toLocaleString() : <span className="text-gray-300"></span>}
const ct = e.latestContract?.contractType
if (!ct || ['LABOR', 'INTERNSHIP', 'PARTTIME', 'OUTSOURCING', 'UNSIGNED'].includes(ct)) return <span className="text-gray-300"></span>
return e.socialInsBase ? e.socialInsBase.toLocaleString() : <span className="text-gray-300"></span>
})()}
</td>} </td>}
{colVisible('socialInsAmount') && <td className="px-4 py-2.5 text-right"> {colVisible('socialInsAmount') && <td className="px-4 py-2.5 text-right">
{(() => { {(() => {