From 88c5cf35a5ea870378d7964086ed2c09ddc299c8 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 09 九月 2024 17:52: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/WebProcessDefineServiceImpl.java | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java index 18a6d75..ca79668 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java @@ -1,13 +1,11 @@ package com.vci.web.service.impl; import com.vci.corba.omd.data.LinkObject; -import com.vci.file.pagemodel.VciFileObjectVO; +import com.vci.dto.ProcessTemplateVO; import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI; import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI; import com.vci.frameworkcore.compatibility.SmUserQueryServiceI; -import com.vci.frameworkcore.pagemodel.OrgDepartmentVO; -import com.vci.frameworkcore.pagemodel.SmRoleVO; -import com.vci.frameworkcore.pagemodel.SmUserVO; +import com.vci.pagemodel.*; import com.vci.starter.web.enumpck.DataSecretEnum; import com.vci.starter.web.enumpck.UserSecretEnum; import com.vci.starter.web.exception.VciBaseException; @@ -15,11 +13,10 @@ import com.vci.starter.web.util.Md5; import com.vci.starter.web.util.VciBaseUtil; import com.vci.starter.web.wrapper.VciQueryWrapperForDO; -import com.vci.web.constant.FileTypeConstants; -import com.vci.web.constant.WFVariablesKeyConstant; +import com.vci.constant.FileTypeConstants; +import com.vci.constant.WFVariablesKeyConstant; import com.vci.web.dao.WebProcessDaoI; -import com.vci.web.model.WFProcessClassifyDO; -import com.vci.web.pageModel.*; +import com.vci.model.WFProcessClassifyDO; import com.vci.web.properties.WebProperties; import com.vci.web.service.*; import com.vci.web.util.PlatformClientUtil; @@ -106,8 +103,8 @@ * @param showAll 鏄惁鏄剧ず鎵�鏈夌殑鐗堟湰 */ @Override - public List<ProcessTemplateVO> getMyTemplates(String type,String filterTemplate, - boolean showAll) throws VciBaseException { + public List<ProcessTemplateVO> getMyTemplates(String type, String filterTemplate, + boolean showAll) throws VciBaseException { //鐜板湪娌℃湁娣诲姞鐢ㄦ埛鐨勮繃婊� return processDao.getTemplatesByType(type,filterTemplate,showAll); } -- Gitblit v1.9.3