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 dataMap = new HashMap(); dataMap.put("test","test200"); try { - - String pkey = "uf_nj_cyqltjb.appid"; - String appid = jucailinPortalUtils.getUfPropData(pkey,tenant_key); + String appid = request.getParameter("appid"); List 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 columnNameList = Arrays.asList(columnnames.split(",")); Map 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 fieldlist = ietFormDatasetService.getFields(module,objid,formatType,needChild); + log.error("fieldlist:"+fieldlist.size()); for(int i=0;i