From 51542c2d2272cfe19db8e7dbc07cccc1c448d22a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 20 九月 2024 15:17:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
index 345e660..f81932a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeBreakCodeDaoImpl.java
@@ -1,13 +1,13 @@
package com.vci.web.dao.impl;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.OsCodeBreakCodeDaoI;
-import com.vci.web.model.OsCodeBreakCodeDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.vci.model.OsCodeBreakCodeDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@
import java.util.List;
import java.util.Map;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
* Description:鏂爜鍐呭鏁版嵁鎿嶄綔灞傚疄鐜扮被
@@ -172,14 +172,14 @@
VciBaseUtil.alertNotNull(ruleOid,"瑙勫垯鍒嗙被",serialAccord,"娴佹按渚濇嵁");
Map<String,String> conditionMap = new HashMap<String, String>();
conditionMap.put("pkcoderule",ruleOid);
- List<com.vci.client.bof.ClientBusinessObject> queryList = this.boService.queryCBO("codebreakcode", conditionMap);
+ List<BusinessObject> queryList = this.boService.queryCBO("codebreakcode", conditionMap);
if (CollectionUtils.isEmpty(queryList)){
throw new VciBaseException("瑙勫垯鍒嗙被[{0}]鍦ㄧ郴缁熶腑涓嶅瓨鍦�",new String[]{ruleOid});
}
conditionMap.clear();
String oid = "";
- for (com.vci.client.bof.ClientBusinessObject object : queryList) {
- oid += object.getOid() + ",";
+ for (BusinessObject object : queryList) {
+ oid += object.oid + ",";
}
oid = "(" + oid.substring(0,oid.length() -1) + ")";
conditionMap.put("oid", QueryOptionConstant.IN + oid);
--
Gitblit v1.9.3