From 3418f61a47946529b5f413e0d0548302c19a968b Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 02 十二月 2024 14:34:49 +0800 Subject: [PATCH] 1、部分查询接口增加排序。2、UI部分的页面定义管理界面增加BS自定义查询方式和CS自定义查询方式两个字段的增删改逻辑。 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 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/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java index 57b148a..3a842d0 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/frameworkcore/compatibility/impl/SmPwdStrategyQueryServiceImpl.java @@ -1,17 +1,16 @@ package com.vci.frameworkcore.compatibility.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.model.OrgDeptForPlatform1; -import com.vci.frameworkcore.model.dto.SmPasswordStrategyDTO; import com.vci.frameworkcore.enumpck.CombinationEnum; -import com.vci.frameworkcore.model.SmPasswordStrategyDO; -import com.vci.frameworkcore.model.SmPasswordStrategyForPlatform1; -import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO; +import com.vci.model.SmPasswordStrategyDO; +import com.vci.model.SmPasswordStrategyForPlatform1; +import com.vci.pagemodel.SmPasswordStrategyVO; import com.vci.omd.utils.ObjectTool; import com.vci.starter.web.constant.QueryOptionConstant; import com.vci.starter.web.exception.VciBaseException; @@ -34,7 +33,8 @@ import java.util.*; import java.util.stream.Collectors; -import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST; + +import static com.vci.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST; /** * 瀵嗙爜绛栫暐鏌ヨ鏈嶅姟 @@ -259,6 +259,9 @@ if(strategy.getRequireCharCount() > strategy.getCombinations().split(",").length){ throw new VciBaseException("蹇呭~绉嶇被涓嶈兘澶т簬鎵�閫夋嫨鐨勫瘑鐮佺粍鍚堟柟寮忕殑涓暟!"); } + if(strategy.getRequireCharCount() <= 0){ + throw new VciBaseException("蹇呭~绉嶇被涓嶈兘灏忎簬绛変簬0!"); + } if(strategy.getMaxLength() < strategy.getMinLength()){ throw new VciBaseException("瀵嗙爜鏈�澶ч暱搴︿笉鑳藉皬浜庢渶灏忛暱搴�!"); } @@ -273,7 +276,7 @@ } //鍒ゆ柇鍓嶇鏄惁鏈彁浜わ紝鏄惁榛樿瀛楁 if(Func.isEmpty(strategy.getDefaultFlag())){ - strategy.setDefaultFlag(0); + strategy.setDefaultFlag("false"); } } @@ -414,6 +417,7 @@ //缁勫悎鏂瑰紡杞崲涓哄瓨鍌ㄥ�� spsDto.setRequireCharType(combinations2Plchartypes(spsDto.getCombinations())); PasswordStrategyInfo passwordStrategyInfo = changePasswordStrategyDTO2Info(spsDto); + return platformClientUtil.getFrameworkService().editPasswordStrategy(passwordStrategyInfo,userEntityInfo); } -- Gitblit v1.9.3