From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
index 31f6b45..78d5d39 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java
@@ -1,24 +1,25 @@
package com.vci.rmip.code.client.codeapply.Apply410;
import cn.hutool.json.JSONUtil;
+
import com.alibaba.fastjson.JSONObject;
import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
import com.vci.base.ui.swing.components.table.VCIJTableNode;
-import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
import com.vci.rmip.code.client.codeapply.Apply410.object.Page;
import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.VciBaseUtil;
import com.vci.base.ui.swing.VCIOptionPane;
-import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeShowFieldConfigVO;
-import com.vci.ubcs.code.vo.webserviceModel.coderule.CodeSrchCondConfigVO;
import com.vci.rmip.code.client.codeapply.Apply410.object.UIFormRefer;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.config.CodeShowFieldConfigVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.config.CodeSrchCondConfigVO;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.model.BaseModel;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.jackson.map.ObjectMapper;
+import java.io.IOException;
import java.util.*;
public class CodeDataMainPanelDataProvider extends AbstractVCIJTableDataProvider<BaseModel> {
@@ -107,7 +108,7 @@
}else{
VCIOptionPane.showMessage(this.ownerPanel,r.getMsg());
}
- } catch (JsonProcessingException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
this.total= new Long(iPage.getTotal()).intValue();
--
Gitblit v1.9.3