From 7e0ba0b21db407c3ef5a2f220dda484bd33969c9 Mon Sep 17 00:00:00 2001
From: lvyuankang <1344032923@qq.com>
Date: Tue, 27 Aug 2024 10:14:06 +0800
Subject: [PATCH] ksyh

---
 entry/src/main/ets/mock/CandidateData.ts | 11 +++++++++++
 entry/src/main/ets/pages/UserInfo.ets    |  1 +
 entry/src/main/ets/pages/interfaces.ts   |  1 +
 3 files changed, 13 insertions(+)

diff --git a/entry/src/main/ets/mock/CandidateData.ts b/entry/src/main/ets/mock/CandidateData.ts
index 307f8040..847e395d 100644
--- a/entry/src/main/ets/mock/CandidateData.ts
+++ b/entry/src/main/ets/mock/CandidateData.ts
@@ -12,6 +12,7 @@ export const CandidateData: Array<User> = [
     bz1: '',
     jxmc: '',
     kchp: '',
+    ksy2:'',
     kscx: '',
     ksdd: '',
     kssycs: '',
@@ -46,6 +47,7 @@ export const CandidateData: Array<User> = [
     xh: '',
     xldm: '',
     yycs: '',
+    ksy2:'',
     ksy2sfzmhm: "",
   },
   {
@@ -70,6 +72,7 @@ export const CandidateData: Array<User> = [
     xldm: '',
     yycs: '',
     ksy2sfzmhm: "",
+    ksy2:'',
   },
   {
     sfzmhm: '3423231995014700004',
@@ -92,6 +95,7 @@ export const CandidateData: Array<User> = [
     xh: '',
     xldm: '',
     yycs: '',
+    ksy2:'',
     ksy2sfzmhm: "",
   },
   {
@@ -116,6 +120,7 @@ export const CandidateData: Array<User> = [
     xldm: '',
     yycs: '',
     ksy2sfzmhm: "",
+    ksy2:'',
   },
   {
     sfzmhm: '342323199501470016',
@@ -138,6 +143,7 @@ export const CandidateData: Array<User> = [
     xh: '',
     xldm: '',
     yycs: '',
+    ksy2:'',
     ksy2sfzmhm: "",
   },
   {
@@ -161,6 +167,7 @@ export const CandidateData: Array<User> = [
     xh: '',
     xldm: '',
     yycs: '',
+    ksy2:'',
     ksy2sfzmhm: "",
   },
   {
@@ -184,6 +191,7 @@ export const CandidateData: Array<User> = [
     xh: '',
     xldm: '',
     yycs: '',
+    ksy2:'',
     ksy2sfzmhm: ""
   },
   {
@@ -207,6 +215,7 @@ export const CandidateData: Array<User> = [
     xh: '',
     xldm: '',
     yycs: '',
+    ksy2:'',
     ksy2sfzmhm: ""
   },
   {
@@ -230,6 +239,7 @@ export const CandidateData: Array<User> = [
     xh: '',
     xldm: '',
     yycs: '',
+    ksy2:'',
     ksy2sfzmhm: "",
   }]
 
@@ -237,6 +247,7 @@ export const EmptyCandidateObject = {
   ksy2sfzmhm: "",
   sfzmhm: '',
   xm: '',
+  ksy2:'',
   lsh: '',
   ksy1: '',
   id: '',
diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets
index 75de1db4..e54d0dc2 100644
--- a/entry/src/main/ets/pages/UserInfo.ets
+++ b/entry/src/main/ets/pages/UserInfo.ets
@@ -219,6 +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
         const {examSubject} = globalThis.carInfo;
         // this.currentUser.kszp=this.photo+res.kszp
diff --git a/entry/src/main/ets/pages/interfaces.ts b/entry/src/main/ets/pages/interfaces.ts
index 95f67a45..d598aa69 100644
--- a/entry/src/main/ets/pages/interfaces.ts
+++ b/entry/src/main/ets/pages/interfaces.ts
@@ -4,6 +4,7 @@ export interface User {
   xm: string
   lsh: string
   ksy1: string
+  ksy2: string
   id: string
   kszp: string
   ksmjzp: string