diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
index 6f1f438..a16996f 100644
--- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py
+++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
@@ -332,6 +332,7 @@ class DataStdDao:
DataStdDict.data_dict_data_type,
DataStdDict.data_std_no,
DataStdDict.data_dict_stat,
+ DataStdMain.data_std_cn_name.label("data_std_cn_name") ,
DataStdMain.data_std_it_ownership_dept.label("data_std_it_ownership_dept") ,
DataStdMain.data_std_busi_ownership_dept.label("data_std_busi_ownership_dept") ,
DataStdMain.data_std_it_ownership_prsn.label("data_std_it_ownership_prsn") ,
diff --git a/vue-fastapi-backend/module_admin/service/datastd_service.py b/vue-fastapi-backend/module_admin/service/datastd_service.py
index 7a2cc1b..9f942bf 100644
--- a/vue-fastapi-backend/module_admin/service/datastd_service.py
+++ b/vue-fastapi-backend/module_admin/service/datastd_service.py
@@ -474,6 +474,9 @@ class DataStdService:
# 创建标准代码的审批记录(changeType 为 update)
appr_model = DataStdCodeApprModel(**code.model_dump(exclude_unset=True, by_alias=True))
last_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,code.onum)
+ if last_appr is None:
+ last_appr=DataStdCodeApprModel()
+ last_appr.onum=code.onum
appr_model.changeType = "update"
appr_model.compareId = last_appr.onum # 对比对象为正式表的 ID
appr_model.oldInstId = code.onum
@@ -509,6 +512,9 @@ class DataStdService:
item_appr_model = DataStdCodeApprModel(**item.model_dump(exclude_unset=True, by_alias=True))
last_item_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,item_appr_model.onum)
+ if last_item_appr is None:
+ last_item_appr=DataStdCodeApprModel()
+ last_item_appr.onum=item_appr_model.onum
item_appr_model.changeType = "update"
item_appr_model.compareId = last_item_appr.onum
item_appr_model.parent_id = appr_model.onum
@@ -1250,6 +1256,9 @@ class DataStdService:
if len(watingList)>0 : # 如果 watingList 存在,意味着标准正在审批中
raise ServiceException(message="标准正在审批中,请等待审批完成")
lastAppr =await DataStdDao.get_last_std_main_appr_by_id(query_db,model.onum)
+ if lastAppr is None:
+ lastAppr=DataStdDictApprModel()
+ lastAppr.onum=model.onum
apprModel = DataStdMainApprModel(**model.model_dump(exclude_unset=True, by_alias=True))
apprModel.changeType="edit"
apprModel.onum=str(uuid.uuid4())
@@ -1274,6 +1283,9 @@ class DataStdService:
if len(watingList)>0 : # 如果 watingList 存在,意味着标准正在审批中
raise ServiceException(message="标准正在审批中,请等待审批完成")
lastAppr =await DataStdDao.get_last_std_dict_appr_by_id(query_db,model.onum)
+ if lastAppr is None:
+ lastAppr=DataStdDictApprModel()
+ lastAppr.onum=model.onum
apprModel = DataStdDictApprModel(**model.model_dump(exclude_unset=True, by_alias=True))
apprModel.changeType="edit"
apprModel.onum=str(uuid.uuid4())
diff --git a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
index c5bfc03..109125b 100644
--- a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
@@ -142,7 +142,7 @@
@click="handleStdClick(row.dataStdNo)"
style="cursor: pointer"
>
- {{row.dataStdNo}}
+ {{row.dataStdCnName}}