优化

linwei

2026-01-29 89fbcb27691165a2a19c85c36d8c3c84f9d38caf

 drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java

@@ -32,12 +32,15 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springframework.stereotype.Service;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.func.Streams;
import org.sxkj.common.node.TreeStringNode;
import org.sxkj.common.utils.NodeTreeUtil;
import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.system.cache.SysCache;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.excel.DeptExcel;
import org.sxkj.system.excel.DeptImportExcel;
import org.sxkj.system.mapper.DeptMapper;
import org.sxkj.system.param.DeptExportParam;
import org.sxkj.system.param.DeptPageParam;
@@ -301,6 +304,7 @@

   /**
    * 分页查询
    *
    * @param page
    * @param deptPageParam
    * @return
@@ -312,11 +316,12 @@

   /**
    * 导入部门
    *
    * @param data
    * @param isCovered
    */
   @Override
   public void importDept(List<DeptExcel> data, Boolean isCovered) {
   public void importDept(List<DeptImportExcel> data, Boolean isCovered) {
      List<Dept> list = new ArrayList<>();
      data.forEach(deptExcel -> {
         Dept dept = BeanUtil.copy(deptExcel, Dept.class);
@@ -325,12 +330,17 @@
      if (isCovered) {
         this.saveOrUpdateBatch(list);
      } else {
         list.forEach(item -> {
            String times = OrderNumUtils.initOrderNum2(WordOrderConstant.ORG_CODE);
            String deptCode = WordOrderConstant.ORG_PREFIX + times;
            item.setDeptCode(deptCode);
         });
         this.saveBatch(list);
      }
   }

   @Override
   public List<DeptExcel> exportDept(DeptExportParam dept) {
        return baseMapper.exportDept(dept);
      return baseMapper.exportDept(dept);
   }
}