From b3bac568ec6719f183f878195a198aadde9782dd Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Tue, 2 Apr 2024 11:24:22 +0800
Subject: [PATCH] =?UTF-8?q?#E10-18#=20=E7=BB=A9=E6=95=88=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jcldoor/cmd/PortalPerformanceInfoCmd.java  | 14 +++++++-------
 .../controller/HrmSelfHelpController.java      | 18 ------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java
index bc9230b..8d0ebee 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalPerformanceInfoCmd.java
@@ -253,7 +253,7 @@ public class PortalPerformanceInfoCmd {
                     indicatorList.add(recordList.get(0));
 
                     Map<String, Object> indicatorMap = new HashMap<String, Object>();
-                    sql = " select name,data_row,property\n" +
+                    sql =   " select name,data_row,property\n" +
                             " from hr_kpi_details_link\n" +
                             " where kpi_details in( " +
                             "           select id\n" +
@@ -347,6 +347,7 @@ public class PortalPerformanceInfoCmd {
                             "        and DELETE_TYPE = '0'\n" +
                             "    order by name desc\n" +
                             ") w  limit 2";
+
                     log.error("sql4:" + sql);
 
                     List<String> strlist3 = new ArrayList<>(100);
@@ -363,16 +364,16 @@ public class PortalPerformanceInfoCmd {
                         Map<String, Object> recordMap3 = recordList3.get(k);
 
                         String data_row = String.valueOf(recordMap3.get("data_row"));
-
+                        log.error("data_row:" + data_row);
                         Map<String, Object> indicatorMap = new HashMap<String, Object>();
 
-                        sql = " select name,data_row,property\n" +
+                        sql =   " select name,data_row,property\n" +
                                 " from hr_kpi_details_link\n" +
                                 " where kpi_details in( " +
                                 "           select id\n" +
                                 "           from hr_kpi_details " +
-                                "           where KPI_SCHEME=?\n" +
-                                "           and MODULE='kpiSchemeSetting'\n" +
+                                "           where kpi_scheme=?\n" +
+                                "           and module='kpiSchemeSetting'\n" +
                                 "           and TENANT_KEY=?\n" +
                                 "           and DELETE_TYPE = 0" +
                                 "    )\n" +
@@ -380,7 +381,7 @@ public class PortalPerformanceInfoCmd {
                                 "    and TENANT_KEY = ?\n" +
                                 "    and DELETE_TYPE = '0'\n" +
                                 "    and property in('weight', 'describe', 'type')\n" +
-                                "    and data_row in(?)";
+                                "    and data_row = ? ";
 
                         log.error("sql5:" + sql);
 
@@ -412,7 +413,6 @@ public class PortalPerformanceInfoCmd {
                                 indicatorMap.put("indicator_type", name);
                             }
                         }
-
                         indicatorList.add(indicatorMap);
                     }
                 }
diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
index abceb45..dc4b7ab 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
@@ -141,24 +141,6 @@ public class HrmSelfHelpController {
     }
 
 
-    @GetMapping("/testSapi16")
-    @WeaPermission(publicPermission = true)
-    public WeaResult<Object> testSapi16(HttpServletRequest request){
-        Map<String,Object> dataMap = new HashMap<String,Object>();
-        dataMap.put("test","testSapi16");
-
-        try {
-
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("testSapi13:"+e);
-            dataMap.put("count","-1");
-        }
-        return WeaResult.success(dataMap);
-    }
-
-
     @GetMapping("/testSapi15")
     @WeaPermission(publicPermission = true)
     public WeaResult<Object> testSapi15(HttpServletRequest request){