From c6a845528d45bfb44591a69dadb44539432d06d0 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 12 五月 2023 11:55:06 +0800
Subject: [PATCH] 枚举相关改动

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
index 338c9f6..3a43b7d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
@@ -263,7 +263,7 @@
 	 * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
 	 */
 	@Override
-	public List<CodeButtonVO> codeButtonDO2VOs(Collection<CodeButton> codeButtonDOs) throws VciBaseException{
+	public List<CodeButtonVO> codeButtonDO2VOs(Collection<CodeButton>  codeButtonDOs) throws VciBaseException{
 		List<CodeButtonVO> voList = new ArrayList<CodeButtonVO>();
 		if(!CollectionUtils.isEmpty(codeButtonDOs)){
 			for(CodeButton s: codeButtonDOs){
@@ -289,7 +289,7 @@
 			BeanUtilForVCI.copyPropertiesIgnoreCase(codeButtonDO,vo);
 			//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
 			vo.setLcStatusText(FrameworkDataLCStatus.getTextByValue(vo.getLcStatus()));
-			vo.setUsedpositiontypeText(CodeUseButtonPositionTypeEnum.getTextByValue(codeButtonDO.getUsedPositionType()));
+
 		}
 		return vo;
 	}
@@ -319,6 +319,7 @@
 		return  codeButtonDOList;
 	}
 
+
 	@Override
     public R enableCodeButton(String id) {
 		CodeButton codebutton = codeButtonMapper.selectById(id);
@@ -344,7 +345,7 @@
 	 * @return 鎵ц鐨勭粨鏋�
 	 */
 	private R changeLcStatus(CodeButton buttonDTO, boolean disable){
-		// VciBaseUtil.alertNotNull(buttonDTO,"鏁版嵁瀵硅薄",buttonDTO.getOid(),"涓婚敭");
+//		VciBaseUtil.alertNotNull(buttonDTO,"鏁版嵁瀵硅薄",buttonDTO.getOid(),"涓婚敭");
 		if(disable){
 			buttonDTO.setLcStatus(FrameworkDataLCStatus.ENABLED.getValue());
 		}else{

--
Gitblit v1.9.3