diff --git a/main.py b/main.py index da482a6..a0351cf 100644 --- a/main.py +++ b/main.py @@ -244,7 +244,7 @@ for index, row in BaseData.iterrows(): # 添加入职记录 History_pd.loc[len(History_pd)] = [row["入职时间"], row["初始职务"], "", row["入职时的初始级别"], "", "", "套改/定级", ""] for index, prow in promote.iterrows(): # 添加晋升记录 - History_pd.loc[len(History_pd)] = [prow["工资执行时间"], prow["新职务"], "", "", "", "", "晋升", f"任{prow['新职务']} {prow['变动批注']}"] + History_pd.loc[len(History_pd)] = [prow["工资执行时间"], prow["新职务"], "", "", "", "", "晋升", f"任{prow['新职务']} {prow['变动批注'] if pd.notna(prow['变动批注']) else ''}"] try: calctime=row["晋档起始"] + relativedelta(minute=1) while True: # 添加晋档记录