From 926d74c3904439420b1485f4df470b31949425ef Mon Sep 17 00:00:00 2001
From: jimlee <jimlee@sweetless.net>
Date: Fri, 13 Jan 2023 10:09:41 +0800
Subject: [PATCH] =?UTF-8?q?:ok:=20=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E6=97=B6=E5=8F=96=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE,=E4=BB=8Edakajson=E6=A0=B9=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E4=BB=8E?=
 =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95=E4=B8=AD=20:ok:=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E4=B8=AA=E9=A1=B9=E7=9B=AE=E6=89=93?=
 =?UTF-8?q?=E5=8D=A1=E6=97=B6=EF=BC=8C=E5=8F=96=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B9=E7=9B=AE=E6=89=93=E5=8D=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hoperun/sign/api/HoperunDakaController.kt  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt
index 2f84b77..d3cfa71 100644
--- a/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt
@@ -1,7 +1,6 @@
 package com.pomelotea.hoperun.sign.api
 
 import com.alibaba.fastjson.JSON
-import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
 import com.alibaba.fastjson.TypeReference
 import com.pomelotea.hoperun.sign.config.HoperunUserConfig
@@ -160,15 +159,6 @@ class HoperunSignController(
         return sessionMap.get(employeeNo)
     }
 
-    private fun getUsernameAutoLogin(employeeNo: String): String? {
-        val userConfig = hoperunUserConfig.userConfigMap.get(employeeNo)
-        if (userConfig?.username == null) {
-            login(employeeNo)
-        }
-        return hoperunUserConfig.userConfigMap.get(employeeNo)?.username
-    }
-
-
     private fun getUserConfig(employeeNo: String): UserConfig? {
         val userConfig = hoperunUserConfig.userConfigMap.get(employeeNo)
         if (userConfig?.username == null) {
@@ -267,7 +257,7 @@ class HoperunSignController(
         val attendancesDetailResponse = client.newCall(attendancesDetailRequest).execute()
         val bodyString = attendancesDetailResponse.body?.string()
         val dakaJsonArray = JSONObject.parseArray(bodyString)
-        val dakaInfo = dakaJsonArray.getJSONObject(0)
+        val dakaInfo = dakaJsonArray.getJSONObject(dakaJsonArray.size - 1)
         val dakaList = dakaInfo.getJSONArray("list")
         var lastDakaInfo = dakaList.getJSONObject(dakaList.size - 1)
         val userConfig: UserConfig = hoperunUserConfig.userConfigMap.get(employeeNo) ?: UserConfig()
@@ -291,13 +281,13 @@ class HoperunSignController(
             }
         }
         if (userConfig.projectcode == null) {
-            userConfig.projectcode = lastDakaInfo.getString("project_id")
+            userConfig.projectcode = dakaInfo.getString("pro_id")
         }
         if (userConfig.projectname == null) {
-            userConfig.projectname = lastDakaInfo.getString("projectname")
+            userConfig.projectname = dakaInfo.getString("pro_name")
         }
         if (userConfig.project_id == null) {
-            userConfig.project_id = lastDakaInfo.getString("project_id")
+            userConfig.project_id = dakaInfo.getString("pro_id")
         }
         hoperunUserConfig.addUserConfig(
             employeeNo, userConfig