From e92daee1252e2e6a41ab3afeb24987248b394db8 Mon Sep 17 00:00:00 2001
From: lvyuankang <1344032923@qq.com>
Date: Tue, 27 Aug 2024 11:29:08 +0800
Subject: [PATCH] 1

---
 entry/src/main/ets/common/constants/USER.ts     | 4 ++--
 entry/src/main/ets/common/constants/USERLIST.ts | 4 ++--
 entry/src/main/ets/mock/CandidateData.ts        | 1 -
 entry/src/main/ets/pages/UserInfo.ets           | 5 ++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/entry/src/main/ets/common/constants/USER.ts b/entry/src/main/ets/common/constants/USER.ts
index 51dee8d7..bdef9c0e 100644
--- a/entry/src/main/ets/common/constants/USER.ts
+++ b/entry/src/main/ets/common/constants/USER.ts
@@ -25,8 +25,8 @@ CommonConstants {
    */
   static readonly ACCOUNT_TABLE = {
     tableName: 'USER',
-    sqlCreate: 'CREATE TABLE IF NOT EXISTS USER(id TEXT,sfzmhm TEXT,xm CHAR(20), lsh TEXT, kszp TEXT,ksdd TEXT,kssycs TEXT,kslx TEXT,kscx TEXT,ksxl TEXT,ksy1 TEXT,ksmjzp TEXT)',
-    columns: ['id','sfzmhm','xm','lsh','kszp','ksdd','kssycs','kslx','kscx','ksxl','ksy1','ksmjzp']
+    sqlCreate: 'CREATE TABLE IF NOT EXISTS USER(id TEXT,sfzmhm TEXT,xm CHAR(20), lsh TEXT, kszp TEXT,ksdd TEXT,kssycs TEXT,kslx TEXT,kscx TEXT,ksxl TEXT,ksy1 TEXT,ksmjzp TEXT,ksy2 TEXT,xldm TEXT,ksy2sfzmhm TEXT,bz1 TEXT,kchp TEXT,xb TEXT,xh TEXT,yycs TEXT,jxmc TEXT,ksy1sfzmhm TEXT,kszt TEXT)',
+    columns: ['id','sfzmhm','xm','lsh','kszp','ksdd','kssycs','kslx','kscx','ksxl','ksy1','ksmjzp','ksy2','xldm','ksy2sfzmhm','bz1','kchp','xb','xh','yycs','jxmc','ksy1sfzmhm','kszt']
   };
 
   /**
diff --git a/entry/src/main/ets/common/constants/USERLIST.ts b/entry/src/main/ets/common/constants/USERLIST.ts
index 879fea87..ed0ff39b 100644
--- a/entry/src/main/ets/common/constants/USERLIST.ts
+++ b/entry/src/main/ets/common/constants/USERLIST.ts
@@ -25,8 +25,8 @@ CommonConstants {
    */
   static readonly ACCOUNT_TABLE = {
     tableName: 'USERLIST',
-    sqlCreate: 'CREATE TABLE IF NOT EXISTS USERLIST(id TEXT,sfzmhm TEXT,xm CHAR(20), lsh TEXT, kszp TEXT,ksdd TEXT,kssycs TEXT,kslx TEXT,kscx TEXT,ksxl TEXT,ksy1 TEXT,ksmjzp TEXT)',
-    columns: ['id','sfzmhm','xm','lsh','kszp','ksdd','kssycs','kslx','kscx','ksxl','ksy1','ksmjzp']
+    sqlCreate: 'CREATE TABLE IF NOT EXISTS USERLIST(id TEXT,sfzmhm TEXT,xm CHAR(20), lsh TEXT, kszp TEXT,ksdd TEXT,kssycs TEXT,kslx TEXT,kscx TEXT,ksxl TEXT,ksy1 TEXT,ksmjzp TEXT,ksy2 TEXT,xldm TEXT,ksy2sfzmhm TEXT)',
+    columns: ['id','sfzmhm','xm','lsh','kszp','ksdd','kssycs','kslx','kscx','ksxl','ksy1','ksmjzp','ksy2','xldm','ksy2sfzmhm']
   };
 
   /**
diff --git a/entry/src/main/ets/mock/CandidateData.ts b/entry/src/main/ets/mock/CandidateData.ts
index 847e395d..acb694b2 100644
--- a/entry/src/main/ets/mock/CandidateData.ts
+++ b/entry/src/main/ets/mock/CandidateData.ts
@@ -24,7 +24,6 @@ export const CandidateData: Array<User> = [
     xldm: '',
     yycs: '',
     ksy2sfzmhm: "",
-
   },
   {
     sfzmhm: '341182199308155624',
diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets
index e54d0dc2..e18b7a6b 100644
--- a/entry/src/main/ets/pages/UserInfo.ets
+++ b/entry/src/main/ets/pages/UserInfo.ets
@@ -102,7 +102,7 @@ struct UserInfo {
     { label: ' 流 水 号 ', key: 'lsh' },
     { label: '考试路线', key: 'ksxl' },
     { label: '待考次数', key: 'kssycs' },
-    { label: '考官姓名', key: 'ksy1' },
+    { label: '考官姓名', key: 'ksy2' },
   ]
   errorDialog: CustomDialogController = new CustomDialogController({
     builder: errorMsgDialog({
@@ -219,8 +219,7 @@ struct UserInfo {
         this.currentUser = res
         this.lsh = this.currentUser.lsh
         globalThis.lsh = this.currentUser.lsh
-        this.currentUser.ksy1=this.currentUser.ksy1?this.currentUser.ksy1:this.currentUser.ksy2;
-        globalThis.ksyh = this.currentUser.ksy1sfzmhm || this.currentUser.ksy2sfzmhm
+        globalThis.ksyh = this.currentUser.ksy1sfzmhm
         const {examSubject} = globalThis.carInfo;
         // this.currentUser.kszp=this.photo+res.kszp
         // this.currentUser.ksmjzp=this.photo+this.currentUser.ksmjzp