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/OrgDeptQueryServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OrgDeptQueryServiceImpl.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OrgDeptQueryServiceImpl.java
index 16e89a2..8de5f76 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OrgDeptQueryServiceImpl.java
@@ -1,12 +1,12 @@
-package com.vci.frameworkcore.compatibility.impl;
+package com.vci.web.service.impl;
import com.vci.dto.OrgDepartmentDTO;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.DeptInfo;
import com.vci.corba.omd.data.BusinessObject;
-import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
+import com.vci.web.service.OrgDeptQueryServiceI;
+import com.vci.lcstatuspck.FrameworkDataLCStatus;
import com.vci.model.OrgDeptForPlatform1;
import com.vci.po.OrgDeptPO;
import com.vci.pagemodel.OrgDepartmentVO;
@@ -24,7 +24,7 @@
import com.vci.starter.web.util.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
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;
@@ -33,7 +33,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.io.File;
@@ -534,7 +533,7 @@
orgDepartmentVOList = deptDO2VOs(boService.selectByQueryWrapper(queryWrapperForDO,OrgDeptForPlatform1.class));
}
TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions();
- BeanUtil.convert(treeQueryObject,treeWrapperOptions);
+ BeanUtilForVCI.convert(treeQueryObject,treeWrapperOptions);
treeWrapperOptions.setParentFieldName("pkFatherDepartment");
List<Tree> trees = revisionModelUtil.doList2Trees(orgDepartmentVOList, treeWrapperOptions, dept -> {
return dept.getId() + " " + dept.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equals(dept.getLcStatus()) ? "銆愬仠鐢ㄣ��" : "");
@@ -677,7 +676,7 @@
throw new VciBaseException("鍚屼竴鐖惰妭鐐逛笅璇ラ儴闂ㄥ悕绉版垨缂栧彿宸茬粡瀛樺湪,璇蜂慨鏀�!");
}
OrgDepartmentDTO departmentDTO = new OrgDepartmentDTO();
- BeanUtil.convert(dbDepartmentVO,departmentDTO);
+ BeanUtilForVCI.convert(dbDepartmentVO,departmentDTO);
departmentDTO.setCode(orgDepartmentDTO.getCode());
departmentDTO.setId(orgDepartmentDTO.getId());
departmentDTO.setSpecialties(orgDepartmentDTO.getSpecialties());
@@ -845,7 +844,7 @@
indexMap.put(po.getName(),po.getRowIndex());
//鏍￠獙鏁版嵁灏辫缁勮鎴怐TO鏁版嵁瀵硅薄浜�
OrgDepartmentDTO dto = new OrgDepartmentDTO();
- BeanUtil.convert(po,dto);
+ BeanUtilForVCI.convert(po,dto);
dto.setOid(po.getId());
dto.setId(po.getNum());
dto.setDescription(po.getDesc());
--
Gitblit v1.9.3