From 15fd75c395784afa2cc3e805774e2c8cbc5a3eb7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 06 五月 2023 13:50:39 +0800
Subject: [PATCH] 部署打包时jar中没有主清单属性问题
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
index fca0d69..f8f8a53 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
@@ -16,6 +16,7 @@
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.service.ICodeClassifyProcessTempService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
+import com.vci.ubcs.common.utils.PageDO2PageVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
@@ -60,7 +61,6 @@
@Autowired
private RevisionModelUtil revisionModelUtil;
-
/**
* 鏌ヨ鎵�鏈夌殑鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
* @param conditionMap 鏌ヨ鏉′欢
@@ -87,10 +87,8 @@
//DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<>();
if (!CollectionUtils.isEmpty(doList.getRecords())) {
pageList.setRecords(codeClassifyProcessTempDO2VOs(doList.getRecords()));
- pageList.setTotal(doList.getTotal());
- pageList.setSize(doList.getSize());
- pageList.setCurrent(doList.getCurrent());
- pageList.setPages(doList.getPages());
+ //鍒嗛〉鍙傛暟杞埌pageVO瀵硅薄
+ pageList = PageDO2PageVO.pageDO2PageVO(doList,pageList);
}
return pageList;
}
--
Gitblit v1.9.3