From 4c5bd8be955ae7a54dbb427b614e26c4dd104374 Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Wed, 24 Apr 2024 18:51:15 +0800
Subject: [PATCH] =?UTF-8?q?#E10-31#=20=E4=BC=98=E5=8C=96=E7=BE=A4=E8=81=8A?=
 =?UTF-8?q?=E7=AD=89eb=E8=A1=A8rpc=E6=8E=A5=E5=8F=A3fieldid=E7=9A=84?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jcldoor/controller/HrmSelfHelpController.java    | 12 ++++++------
 .../seconddev/jcldoor/util/JucailinPortalUtils.java  |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

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 c8c30f0..56ef3be 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
@@ -37,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.weaver.ebuilder.form.client.entity.field.ModuleField;
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
@@ -1836,9 +1835,7 @@ public class HrmSelfHelpController {
         Map<String,Object> dataMap = new HashMap<String,Object>();
         dataMap.put("test","test200");
         try {
-
-            String pkey = "uf_nj_cyqltjb.appid";
-            String appid =  jucailinPortalUtils.getUfPropData(pkey,tenant_key);
+            String appid = request.getParameter("appid");
             List<Obj> list = ietFormDatasetService.getTables(appid);
             dataMap.put("datas",list);
         } catch (Exception e) {
@@ -1858,16 +1855,19 @@ public class HrmSelfHelpController {
         dataMap.put("test","test201");
         String columnnames = request.getParameter("columnnames");
         String objid = request.getParameter("objid");
+        log.error("objid:"+objid);
         try {
             if(StringUtils.isNotBlank(objid)){
-                Long obj_id = Long.parseLong(objid);
+                Long obj_id = Long.valueOf(objid);
+                log.error("obj_id:"+obj_id);
                 List<String> columnNameList = Arrays.asList(columnnames.split(","));
                 Map<String,String> fieldMap = jucailinPortalUtils.getFieldIdByColumnName(obj_id,columnNameList,false);
                 dataMap.put("datas",fieldMap);
             }
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("testSapi8:"+e);
+            log.error("test201:"+e);
+            dataMap.put("test201","1");
         }
         return WeaResult.success(dataMap);
     }
diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
index 4d816bf..190f0f8 100644
--- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
+++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java
@@ -749,6 +749,7 @@ public class JucailinPortalUtils {
             String module = "" ;
             String formatType = "0";
             List<ModuleField> fieldlist = ietFormDatasetService.getFields(module,objid,formatType,needChild);
+            log.error("fieldlist:"+fieldlist.size());
             for(int i=0;i<fieldlist.size();i++){
                 ModuleField moduleField = fieldlist.get(i);
                 String columnname = moduleField.getColumnName();