diff --git a/main.py b/main.py index 3819fb9..5d4e263 100644 --- a/main.py +++ b/main.py @@ -280,7 +280,10 @@ for index, row in BaseData.iterrows(): if hrow["变动原因"] == "两年晋档": History_pd.at[index, "级别档次"] = f"{jb}-{dc+1}" elif hrow["变动原因"] == "五年晋级": - History_pd.at[index, "级别档次"] = f"{jb-1}-{dc-1}" + if jb-1 < 1 or jb-1 < role_limit(History_pd.iloc[index]["职务"]): + History_pd.at[index, "级别档次"] = f"{jb}-{dc+1}" + else: + History_pd.at[index, "级别档次"] = f"{jb-1}-{dc-1}" elif hrow["变动原因"] == "工资调标": History_pd.at[index, "级别档次"] = f"{jb}-{dc}" elif hrow["变动原因"] == "晋升":