entry/src/main/ets/mock/CarCheck.ets

@@ -136,8 +136,8 @@ export const RealNumData = {
   8: 18,
   9: 5,
   10: 29,
-  11: 31,
-  12: 30,
+  11: 30,
+  12: 31,
   13: 32,
   14: 28,
   15: 28,

entry/src/main/ets/pages/UserInfo.ets

@@ -212,62 +212,41 @@ struct UserInfo {
         console.log('useruser1,', JSON.stringify(data))
 
         const user = data[0]
-        if(!Number(user.kssycs)){
+        if (user && Number(user.kssycs)) {
+          let flag = false
+          this.list.forEach(res => {
+            if (res.sfzmhm == user.sfzmhm) {
+              flag = true
+              res.kssycs = user.kssycs
+              this.getCurrentStudent(res.sfzmhm)
+            }
+          })
+          if (!flag) {
+            this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
+            globalThis.lsh = this.list.length?this.currentUser.lsh:'1111111111111'
+          }
+        } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
+          console.log('datadatadatadata')
           this.list = this.list.filter(res => {
             return res.sfzmhm != user.sfzmhm
           })
-        }
-        this.pageIndex = 0
-        this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
-        if (this.dataList.length) {
-          setTimeout(() => {
-            this.currentUser = this.dataList[0]
-            this.currentUser.ksy2 = globalThis.kgxm
-            globalThis.lsh = this.currentUser.lsh
-          }, 200)
-        } else {
-          this.currentUser = EmptyCandidateObject
-          globalThis.lsh = '1111111111111'
+          this.pageIndex = 0
+          this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
+          if (this.dataList.length) {
+            setTimeout(() => {
+              this.currentUser = this.dataList[0]
+              this.currentUser.ksy2 = globalThis.kgxm
+              globalThis.lsh = this.currentUser.lsh
+            }, 200)
+          } else {
+            this.currentUser = EmptyCandidateObject
+            globalThis.lsh = '1111111111111'
+          }
         }
         this.list.forEach((res, index) => {
           res.id = index.toString()
         })
         await upDateTableByArray('USERLIST', this.list || [])
-
-        // if(this.)
-        // if (user && Number(user.kssycs)) {
-        //
-        //   let flag = false
-        //   this.list.forEach(res => {
-        //     if (res.sfzmhm == user.sfzmhm) {
-        //       flag = true
-        //       res.kssycs = user.kssycs
-        //       this.getCurrentStudent(res.sfzmhm)
-        //     }
-        //   })
-        //   if (!flag) {
-        //     this.currentUser = (this.list.length ? this.list[0] : EmptyCandidateObject)
-        //     globalThis.lsh = this.list.length?this.currentUser.lsh:'1111111111111'
-        //   }
-        // } else if (user && (user.kssycs == '0' || user.kssycs == '')) {
-        //   console.log('datadatadatadata')
-        //   this.list = this.list.filter(res => {
-        //     return res.sfzmhm != user.sfzmhm
-        //   })
-        //   this.pageIndex = 0
-        //   this.dataList = this.list.slice(this.pageIndex * 4, this.pageIndex * 4 + 4)
-        //   if (this.dataList.length) {
-        //     setTimeout(() => {
-        //       this.currentUser = this.dataList[0]
-        //       this.currentUser.ksy2 = globalThis.kgxm
-        //       globalThis.lsh = this.currentUser.lsh
-        //     }, 200)
-        //   } else {
-        //     this.currentUser = EmptyCandidateObject
-        //     globalThis.lsh = '1111111111111'
-        //   }
-        // }
-
       } else {
         await this.getExaminationStudentInfoFn()
       }
@@ -738,21 +717,21 @@ struct UserInfo {
           return res.kssycs == '1'
         })
         if (this.dataList.length) {
-          // if (user.length) {
-          //   setTimeout(() => {
-          //     this.currentUser = user[0]
-          //     this.currentUser.ksy2 = globalThis.kgxm
-          //     globalThis.lsh = this.currentUser.lsh
-          //     globalThis.ksyh = this.currentUser.ksy1sfzmhm
-          //   }, 200)
-          // } else {
+          if (user.length) {
+            setTimeout(() => {
+              this.currentUser = user[0]
+              this.currentUser.ksy2 = globalThis.kgxm
+              globalThis.lsh = this.currentUser.lsh
+              globalThis.ksyh = this.currentUser.ksy1sfzmhm
+            }, 200)
+          } else {
             setTimeout(() => {
               this.currentUser = this.dataList[0]
               this.currentUser.ksy2 = globalThis.kgxm
               globalThis.ksyh = this.currentUser.ksy1sfzmhm
               globalThis.lsh = this.currentUser.lsh
             }, 200)
-          // }
+          }
         } else {
           this.currentUser = EmptyCandidateObject
         }