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/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java
index 3a842d0..9abee0c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmPwdStrategyQueryServiceImpl.java
@@ -1,27 +1,27 @@
-package com.vci.frameworkcore.compatibility.impl;
+package com.vci.web.service.impl;
-import com.vci.dto.SmPasswordStrategyDTO;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.PasswordStrategyInfo;
import com.vci.corba.omd.data.BusinessObject;
-import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
-import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.enumpck.CombinationEnum;
+import com.vci.dto.SmPasswordStrategyDTO;
import com.vci.model.SmPasswordStrategyDO;
import com.vci.model.SmPasswordStrategyForPlatform1;
-import com.vci.pagemodel.SmPasswordStrategyVO;
import com.vci.omd.utils.ObjectTool;
+import com.vci.pagemodel.SmPasswordStrategyVO;
+import com.vci.starter.web.util.BeanUtilForVCI;
+import com.vci.web.service.SmUserQueryServiceI;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
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.VciBaseUtil;
import com.vci.starter.web.util.WebThreadLocalUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
+import com.vci.web.enumpck.CombinationEnum;
+import com.vci.web.service.SmPwdStrategyQueryServiceI;
import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -456,7 +456,7 @@
SmPasswordStrategyDO passwordStrategyDO = new SmPasswordStrategyDO();
WebUtil.copyValueToObjectFromCbos(item,passwordStrategyDO);
SmPasswordStrategyVO passwordStrategyVO = new SmPasswordStrategyVO();
- BeanUtil.convert(passwordStrategyDO,passwordStrategyVO);
+ BeanUtilForVCI.convert(passwordStrategyDO,passwordStrategyVO);
smPasswordStrategyVOMap.put(passwordStrategyVO.getOid(),passwordStrategyVO);
});
return smPasswordStrategyVOMap;
@@ -477,7 +477,7 @@
SmPasswordStrategyDO passwordStrategyDO = new SmPasswordStrategyDO();
WebUtil.copyValueToObjectFromCbos(cboList.get(0),passwordStrategyDO);
SmPasswordStrategyVO passwordStrategyVO = new SmPasswordStrategyVO();
- BeanUtil.convert(passwordStrategyDO,passwordStrategyVO);
+ BeanUtilForVCI.convert(passwordStrategyDO,passwordStrategyVO);
return passwordStrategyVO;
}else{
//鑾峰彇榛樿鐨�
@@ -518,7 +518,7 @@
*/
private SmPasswordStrategyVO pwdStrategyDO2VO(SmPasswordStrategyDO smPasswordStrategyDO){
SmPasswordStrategyVO passwordStrategyVO = new SmPasswordStrategyVO();
- BeanUtil.convert(smPasswordStrategyDO,passwordStrategyVO);
+ BeanUtilForVCI.convert(smPasswordStrategyDO,passwordStrategyVO);
return passwordStrategyVO;
}
@@ -605,7 +605,7 @@
SmPasswordStrategyDO passwordStrategyDO = new SmPasswordStrategyDO();
WebUtil.copyValueToObjectFromCbos(item,passwordStrategyDO);
SmPasswordStrategyVO passwordStrategyVO = new SmPasswordStrategyVO();
- BeanUtil.convert(passwordStrategyDO,passwordStrategyVO);
+ BeanUtilForVCI.convert(passwordStrategyDO,passwordStrategyVO);
smPasswordStrategyVOList.add(passwordStrategyVO);
});
return smPasswordStrategyVOList;
--
Gitblit v1.9.3