diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 6593d87..d9e4b28 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -15,6 +15,7 @@
 const QString BaseCommonApi::measure_person_id="1695282436182188034";
 static SyncRunStatus syncstate=SyncRunStatus::Stopped;
 
+static QString loginUserId = nullptr;
 
 //sys_user表的id转换为measure_person_id 检定人id（meter_staff表id）
 StaffInfo BaseCommonApi::ConvertStaffInfo(QString userId)
@@ -105,18 +106,19 @@
     return outStr.trimmed();
 }
 
-bool BaseCommonApi::SysUserLogin(QString account,QString password){
+bool BaseCommonApi::SysUserLogin(QString account,QString password=nullptr){
     QSqlQuery query;
     query.prepare("SELECT *	FROM sys_user "
-                            " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD ");
+                            " WHERE ACCOUNT = :ACCOUNT ");
     query.bindValue(":ACCOUNT",account);
-    query.bindValue(":PASSWORD",password);
+//    query.bindValue(":PASSWORD",password);
     bool isSuccess = query.exec();
     if(!isSuccess){
         qDebug()<<query.lastError().text();
         return false;
     }
     if (query.next()) {
+
         return true;
     } else {
         return false;
@@ -131,7 +133,7 @@
     QSqlQuery query;
     QString deptId=ConvertStaffInfo(temporary_user_id).dept_id;
     query.prepare("SELECT   blei.id AS id, blei.sample_id as equipmentId,eei.equipment_name AS sampleName, eei.model AS sampleModel,eei.help_instruction AS helpInstruction, "
-              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent,blei.measure_status,bo.id as orderId "
+              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent,blei.measure_status,bo.id as orderId,bo.create_user_id "
               "FROM biz_business_lab_executive_info blei  "
               "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
               "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
@@ -157,7 +159,7 @@
         dept.is_urgent = query.value("is_urgent").toString();
         dept.measure_status=query.value("measure_status").toString();
         dept.orderId = query.value("orderId").toString();
-
+        dept.create_user_id = query.value("create_user_id").toString();
         result.append(dept);
 //        qDebug() <<"---+"<<dept.sample_id;
     }
@@ -1844,6 +1846,8 @@
             programInfo.equipment_name = query.value("equipment_name").toString();
             programInfo.model = query.value("model").toString();
             programInfo.help_instruction = query.value("help_instruction").toString();
+            programInfo.biz_standard_name = query.value("biz_standard_name").toString();
+            programInfo.biz_standard_id = query.value("biz_standard_id").toString();
             result = programInfo;
         }
     } else {
@@ -1890,10 +1894,10 @@
     QSqlQuery query;
     query.prepare(" INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, "
                   " remark,img_path,tested_device_id,standard_device_id,update_time,belong_standard_equipment,"
-                  " equipment_item_category,equipment_name,model,help_instruction)"
+                  " equipment_item_category,equipment_name,model,help_instruction,biz_standard_name,biz_standard_id)"
                   " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, "
                   " :standard_device_id,:update_time,:belong_standard_equipment,:equipment_item_category,"
-                  " :equipment_name,:model,:help_instruction);");
+                  " :equipment_name,:model,:help_instruction,:biz_standard_name,:biz_standard_id);");
        QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss");
        query.bindValue(":id", verInfo.id);
        query.bindValue(":program_name", verInfo.program_name);
@@ -1909,6 +1913,8 @@
        query.bindValue(":equipment_name",verInfo.equipment_name);
        query.bindValue(":model",verInfo.model);
        query.bindValue(":help_instruction",verInfo.help_instruction);
+       query.bindValue(":biz_standard_name",verInfo.biz_standard_name);
+       query.bindValue(":biz_standard_id",verInfo.biz_standard_id);
        bool isSuccess = query.exec();
        if (!isSuccess) {
            qDebug() << "InsertTaskBasic query failed: " << query.lastError().text();
@@ -2483,15 +2489,17 @@
 {
     QSqlQuery query;
     query.prepare("INSERT INTO biz_business_device_measure_equipment "
-                  " (id,data_id,equipment_id,create_time,update_time) "
-                  " VALUES "
-                  " (:id,:data_id,:equipment_id,:create_time,:update_time)");
+                  " (id,data_id,equipment_id,standard_id,standard_name,create_time,update_time)"
+                  " VALUES"
+                  " (:id,:data_id,:equipment_id,:standard_id,:standard_name,:create_time,:update_time)");
 
         QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
 //       QString createTime = deviceMeasure.create_time.toString("yyyy-MM-dd HH:mm:ss");
        query.bindValue(":id", deviceMeasure.id);
        query.bindValue(":data_id", deviceMeasure.data_id);
        query.bindValue(":equipment_id", deviceMeasure.equipment_id);
+       query.bindValue(":standard_id", deviceMeasure.standard_id);
+       query.bindValue(":standard_name", deviceMeasure.standard_name);
        query.bindValue(":create_time", currentDateTime);
        query.bindValue(":update_time", currentDateTime);
        bool isSuccess = query.exec();
@@ -2499,7 +2507,7 @@
             QString ssql = "INSERT INTO biz_business_device_measure_equipment "
                                              " (id,data_id,equipment_id,create_time,update_time) "
                                              " VALUES "
-                                             " (:1,:2,:3,:4,:5)";
+                                             " (:1,:2,:3,:4,:5,:6,:7)";
             saveLogToSql(ssql,&deviceMeasure);
        }else {
            qDebug() << "InsertTaskBasic query failed: " << query.lastError().text();
@@ -2632,9 +2640,11 @@
      }
      if(deviceMeasureEquipment!=nullptr){
          resultsql = QString(ssql)
-              .arg("'" + deviceMeasureEquipment->id +"'")
-              .arg("'" + deviceMeasureEquipment->data_id +"'")
-              .arg("'" + deviceMeasureEquipment->equipment_id +"'")
+              .arg(deviceMeasureEquipment->id)
+              .arg(deviceMeasureEquipment->data_id)
+              .arg(deviceMeasureEquipment->equipment_id)
+             .arg(deviceMeasureEquipment->standard_id)
+             .arg("'" + deviceMeasureEquipment->standard_name +"'")
               .arg("'" + currentDateTime + "'")
               .arg("'" + currentDateTime + "'");
      }
@@ -2657,8 +2667,10 @@
              .arg("'" +deviceMeasureCalibrator->maximum_error+"'")
              .arg("'" +deviceMeasureCalibrator->absolute_error+"'")
              .arg("'" +deviceMeasureCalibrator->resolution+"'")
-             .arg("'" +deviceMeasureCalibrator->line_mode+"'")
-             .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'")
+             .arg("'" +deviceMeasureCalibrator->line_mode == "" ? "/":deviceMeasureCalibrator->line_mode +"'")
+             .arg("'" +deviceMeasureCalibrator->remark+"'")
+             .arg("'" +deviceMeasureCalibrator->an+"'")
+             .arg("'" +deviceMeasureCalibrator->bn+"'")
                 .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'")
                  .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'")
                 .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'");
@@ -7371,12 +7383,6 @@
              result.insert(row[5],resultMap);
        }
     }
-
-
-//        result.insert("DCI",resultMap);
-//        result.insert("ACI",resultMap);
-//        result.insert("R",resultMap);
-//        result.insert("DCV",resultMap);
         return result;
 }
 //【保存】核查数据-多功能校准源

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 6593d87..d9e4b28 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -15,6 +15,7 @@
 const QString BaseCommonApi::measure_person_id="1695282436182188034";
 static SyncRunStatus syncstate=SyncRunStatus::Stopped;
 
+static QString loginUserId = nullptr;
 
 //sys_user表的id转换为measure_person_id 检定人id（meter_staff表id）
 StaffInfo BaseCommonApi::ConvertStaffInfo(QString userId)
@@ -105,18 +106,19 @@
     return outStr.trimmed();
 }
 
-bool BaseCommonApi::SysUserLogin(QString account,QString password){
+bool BaseCommonApi::SysUserLogin(QString account,QString password=nullptr){
     QSqlQuery query;
     query.prepare("SELECT *	FROM sys_user "
-                            " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD ");
+                            " WHERE ACCOUNT = :ACCOUNT ");
     query.bindValue(":ACCOUNT",account);
-    query.bindValue(":PASSWORD",password);
+//    query.bindValue(":PASSWORD",password);
     bool isSuccess = query.exec();
     if(!isSuccess){
         qDebug()<<query.lastError().text();
         return false;
     }
     if (query.next()) {
+
         return true;
     } else {
         return false;
@@ -131,7 +133,7 @@
     QSqlQuery query;
     QString deptId=ConvertStaffInfo(temporary_user_id).dept_id;
     query.prepare("SELECT   blei.id AS id, blei.sample_id as equipmentId,eei.equipment_name AS sampleName, eei.model AS sampleModel,eei.help_instruction AS helpInstruction, "
-              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent,blei.measure_status,bo.id as orderId "
+              " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME,bo.require_over_time, bo.is_urgent,blei.measure_status,bo.id as orderId,bo.create_user_id "
               "FROM biz_business_lab_executive_info blei  "
               "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id "
               "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID "
@@ -157,7 +159,7 @@
         dept.is_urgent = query.value("is_urgent").toString();
         dept.measure_status=query.value("measure_status").toString();
         dept.orderId = query.value("orderId").toString();
-
+        dept.create_user_id = query.value("create_user_id").toString();
         result.append(dept);
 //        qDebug() <<"---+"<<dept.sample_id;
     }
@@ -1844,6 +1846,8 @@
             programInfo.equipment_name = query.value("equipment_name").toString();
             programInfo.model = query.value("model").toString();
             programInfo.help_instruction = query.value("help_instruction").toString();
+            programInfo.biz_standard_name = query.value("biz_standard_name").toString();
+            programInfo.biz_standard_id = query.value("biz_standard_id").toString();
             result = programInfo;
         }
     } else {
@@ -1890,10 +1894,10 @@
     QSqlQuery query;
     query.prepare(" INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, "
                   " remark,img_path,tested_device_id,standard_device_id,update_time,belong_standard_equipment,"
-                  " equipment_item_category,equipment_name,model,help_instruction)"
+                  " equipment_item_category,equipment_name,model,help_instruction,biz_standard_name,biz_standard_id)"
                   " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, "
                   " :standard_device_id,:update_time,:belong_standard_equipment,:equipment_item_category,"
-                  " :equipment_name,:model,:help_instruction);");
+                  " :equipment_name,:model,:help_instruction,:biz_standard_name,:biz_standard_id);");
        QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss");
        query.bindValue(":id", verInfo.id);
        query.bindValue(":program_name", verInfo.program_name);
@@ -1909,6 +1913,8 @@
        query.bindValue(":equipment_name",verInfo.equipment_name);
        query.bindValue(":model",verInfo.model);
        query.bindValue(":help_instruction",verInfo.help_instruction);
+       query.bindValue(":biz_standard_name",verInfo.biz_standard_name);
+       query.bindValue(":biz_standard_id",verInfo.biz_standard_id);
        bool isSuccess = query.exec();
        if (!isSuccess) {
            qDebug() << "InsertTaskBasic query failed: " << query.lastError().text();
@@ -2483,15 +2489,17 @@
 {
     QSqlQuery query;
     query.prepare("INSERT INTO biz_business_device_measure_equipment "
-                  " (id,data_id,equipment_id,create_time,update_time) "
-                  " VALUES "
-                  " (:id,:data_id,:equipment_id,:create_time,:update_time)");
+                  " (id,data_id,equipment_id,standard_id,standard_name,create_time,update_time)"
+                  " VALUES"
+                  " (:id,:data_id,:equipment_id,:standard_id,:standard_name,:create_time,:update_time)");
 
         QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss");
 //       QString createTime = deviceMeasure.create_time.toString("yyyy-MM-dd HH:mm:ss");
        query.bindValue(":id", deviceMeasure.id);
        query.bindValue(":data_id", deviceMeasure.data_id);
        query.bindValue(":equipment_id", deviceMeasure.equipment_id);
+       query.bindValue(":standard_id", deviceMeasure.standard_id);
+       query.bindValue(":standard_name", deviceMeasure.standard_name);
        query.bindValue(":create_time", currentDateTime);
        query.bindValue(":update_time", currentDateTime);
        bool isSuccess = query.exec();
@@ -2499,7 +2507,7 @@
             QString ssql = "INSERT INTO biz_business_device_measure_equipment "
                                              " (id,data_id,equipment_id,create_time,update_time) "
                                              " VALUES "
-                                             " (:1,:2,:3,:4,:5)";
+                                             " (:1,:2,:3,:4,:5,:6,:7)";
             saveLogToSql(ssql,&deviceMeasure);
        }else {
            qDebug() << "InsertTaskBasic query failed: " << query.lastError().text();
@@ -2632,9 +2640,11 @@
      }
      if(deviceMeasureEquipment!=nullptr){
          resultsql = QString(ssql)
-              .arg("'" + deviceMeasureEquipment->id +"'")
-              .arg("'" + deviceMeasureEquipment->data_id +"'")
-              .arg("'" + deviceMeasureEquipment->equipment_id +"'")
+              .arg(deviceMeasureEquipment->id)
+              .arg(deviceMeasureEquipment->data_id)
+              .arg(deviceMeasureEquipment->equipment_id)
+             .arg(deviceMeasureEquipment->standard_id)
+             .arg("'" + deviceMeasureEquipment->standard_name +"'")
               .arg("'" + currentDateTime + "'")
               .arg("'" + currentDateTime + "'");
      }
@@ -2657,8 +2667,10 @@
              .arg("'" +deviceMeasureCalibrator->maximum_error+"'")
              .arg("'" +deviceMeasureCalibrator->absolute_error+"'")
              .arg("'" +deviceMeasureCalibrator->resolution+"'")
-             .arg("'" +deviceMeasureCalibrator->line_mode+"'")
-             .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'")
+             .arg("'" +deviceMeasureCalibrator->line_mode == "" ? "/":deviceMeasureCalibrator->line_mode +"'")
+             .arg("'" +deviceMeasureCalibrator->remark+"'")
+             .arg("'" +deviceMeasureCalibrator->an+"'")
+             .arg("'" +deviceMeasureCalibrator->bn+"'")
                 .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'")
                  .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'")
                 .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'");
@@ -7371,12 +7383,6 @@
              result.insert(row[5],resultMap);
        }
     }
-
-
-//        result.insert("DCI",resultMap);
-//        result.insert("ACI",resultMap);
-//        result.insert("R",resultMap);
-//        result.insert("DCV",resultMap);
         return result;
 }
 //【保存】核查数据-多功能校准源
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index f4dffc8..d8a1f30 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -35,6 +35,7 @@
    QDateTime require_over_time;
    QString is_urgent;
    QString measure_status;
+   QString create_user_id;
 };
 
 //我的任务
@@ -501,6 +502,8 @@
     QString equipment_name;//设备名称 可为空
     QString model;//型号规格 可为空
     QString help_instruction;//辅助字段 可为空
+    QString biz_standard_name;//标准器的装置名称按，分割
+    QString biz_standard_id;//标准器的装置id按，分割
 };
 
 
@@ -869,6 +872,8 @@
     QString id;
     QString data_id;//检定数据管理基础信息表id
     QString equipment_id;//设备台账id
+    QString standard_id;//标准装置id
+    QString standard_name;//标准装置名称
     QDateTime create_time;
     QDateTime update_time;
 };