From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.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/service/impl/WFWorkflowNodeFavItemServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
index 96652a4..699aa13 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WFWorkflowNodeFavItemServiceImpl.java
@@ -1,5 +1,9 @@
package com.vci.web.service.impl;
+import com.vci.dto.WFWorkflowNodeFavItemDTO;
+import com.vci.model.WFWorkflowNodeFavItemDO;
+import com.vci.pagemodel.BatchCBO;
+import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.bus.VciChangeDocument;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
@@ -7,14 +11,10 @@
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dao.WFWorkflowNodeFavItemDaoI;
-import com.vci.dto.WFWorkflowNodeFavItemDTO;
-import com.vci.model.WFWorkflowNodeFavItemDO;
-import com.vci.pagemodel.BatchCBO;
-import com.vci.pagemodel.WFWorkflowNodeFavItemVO;
import com.vci.web.service.WFWorkflowNodeFavItemServiceI;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -109,7 +109,7 @@
public WFWorkflowNodeFavItemVO wFWorkflowNodeFavItemDO2VO(WFWorkflowNodeFavItemDO wFWorkflowNodeFavItemDO) throws VciBaseException{
WFWorkflowNodeFavItemVO vo = new WFWorkflowNodeFavItemVO();
if(wFWorkflowNodeFavItemDO != null){
- BeanUtil.convert(wFWorkflowNodeFavItemDO,vo);
+ BeanUtilForVCI.convert(wFWorkflowNodeFavItemDO,vo);
//杩橀渶瑕佸鐞嗘灇涓剧瓑鍏朵粬鐨勫唴瀹�
}
return vo;
@@ -128,7 +128,7 @@
VciBaseUtil.alertNotNull(wFWorkflowNodeFavItemDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
//灏咲TO杞崲涓篋O
WFWorkflowNodeFavItemDO wFWorkflowNodeFavItemDO = new WFWorkflowNodeFavItemDO();
- BeanUtil.convert(wFWorkflowNodeFavItemDTO,wFWorkflowNodeFavItemDO);
+ BeanUtilForVCI.convert(wFWorkflowNodeFavItemDTO,wFWorkflowNodeFavItemDO);
revisionModelUtil.wrapperForAdd(wFWorkflowNodeFavItemDO);
BatchCBO batchCBO = wFWorkflowNodeFavItemMapper.insert(wFWorkflowNodeFavItemDO);
--
Gitblit v1.9.3