Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/OrgDeptQueryServiceImpl.java

ÎļþÃû´Ó Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/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());
            //校验数据就该组装成DTO数据对象了
            OrgDepartmentDTO dto = new OrgDepartmentDTO();
            BeanUtil.convert(po,dto);
            BeanUtilForVCI.convert(po,dto);
            dto.setOid(po.getId());
            dto.setId(po.getNum());
            dto.setDescription(po.getDesc());