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-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java
index 1c44f0d..11dca6e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java
@@ -1,16 +1,15 @@
-package com.vci.frameworkcore.compatibility.impl;
+package com.vci.web.service.impl;
 
 import com.vci.constant.FrameWorkBtmTypeConstant;
 import com.vci.corba.common.PLException;
 import com.vci.corba.common.data.UserEntityInfo;
 import com.vci.corba.framework.data.RoleInfo;
 import com.vci.corba.omd.data.BusinessObject;
-import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
-import com.vci.constant.FrameWorkBtmTypeConstant;
+import com.vci.web.service.SmRoleQueryServiceI;
 import com.vci.dto.SmRoleDTO;
-import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.enumpck.RoleClassifyEnum;
-import com.vci.frameworkcore.enumpck.RoleControlAreaEnum;
+import com.vci.web.service.SmUserQueryServiceI;
+import com.vci.enumpck.UI.RoleClassifyEnum;
+import com.vci.enumpck.UI.RoleControlAreaEnum;
 import com.vci.model.SmRoleForPlatform1;
 import com.vci.pagemodel.SmUserVO;
 import com.vci.po.SmRolePO;
@@ -23,13 +22,13 @@
 import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.*;
 import com.vci.starter.web.util.LangBaseUtil;
-import com.vci.web.util.BeanUtil;
+import com.vci.starter.web.util.Lcm.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.UserTypeEnum;
+import com.vci.enumpck.UserTypeEnum;
 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;

--
Gitblit v1.9.3