From 3917e97444aee0cafe7e93180edca156eaefb636 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 31 三月 2021 11:53:28 +0800
Subject: [PATCH] fix(hr微服务): 修改bug
---
febs-server/febs-server-job/Dockerfile | 22 +++++++++++++++++-----
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java | 5 ++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiImportExcel.java | 24 ++++++++++++++++--------
3 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiImportExcel.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiImportExcel.java
index de94684..c3eb34a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiImportExcel.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiImportExcel.java
@@ -8,6 +8,7 @@
import java.util.Date;
import java.util.List;
+import cn.hutool.core.util.StrUtil;
import org.apache.poi.hssf.usermodel.HSSFDataFormat;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -24,7 +25,7 @@
/**
* 描述：获取IO流中的数据，组装成List<List<Object>>对象
- *
+ *
* @param in,fileName
* @return
* @throws IOException
@@ -82,11 +83,11 @@
* sheet.getLastRowNum(); j++) { row = sheet.getRow(j); if (row == null ||
* row.getFirstCellNum() == j) { if (row != null) countCellNum =
* row.getLastCellNum(); continue; }
- *
+ *
* // 遍历所有的列 List<Object> li = new ArrayList<Object>(); for (int y = row
* .getFirstCellNum(); y <= countCellNum; y++) { cell = row.getCell(y);
* li.add(this.getCellValue(cell));
- *
+ *
* } list.add(li); }
*/
@@ -96,7 +97,7 @@
/**
* 描述：获取IO流中的数据，组装成List<List<List<Object>>>对象,多个sheet
- *
+ *
* @param in,fileName
* @return
* @throws IOException
@@ -133,11 +134,18 @@
dataRow = new ArrayList<Object>();
// 获取行
row = sheet.getRow(i);
+
+ cell = row.getCell(0);
+ if ( StrUtil.isBlank(getCellValue(cell).toString())){
+ break;
+ }
+
if (row != null) {
// columns=row.getPhysicalNumberOfCells();//不在这里设置，通过firstRow来获取列数信息。
for (int j = 0; j < columns; j++) {
// 获取某行某列的某一个单元格
cell = row.getCell(j);
+
// 往dataRow存值
dataRow.add(getCellValue(cell));
}
@@ -150,13 +158,13 @@
work.close();
returnList.add(list);
}
-
+
return returnList;
}
/**
* 描述：根据文件后缀，自适应上传文件的版本
- *
+ *
* @param inStr,fileName
* @return
* @throws Exception
@@ -176,7 +184,7 @@
/**
* 描述：对表格中数值进行格式化
- *
+ *
* @param cell
* @return
*/
@@ -247,4 +255,4 @@
}
-}
\ No newline at end of file
+}
diff --git a/febs-server/febs-server-job/Dockerfile b/febs-server/febs-server-job/Dockerfile
index a06552b..9096c98 100644
--- a/febs-server/febs-server-job/Dockerfile
+++ b/febs-server/febs-server-job/Dockerfile
@@ -1,7 +1,19 @@
-FROM openjdk:8u212-jre
-MAINTAINER MrBird 852252810@qq.com
+@charset "UTF-8";
+/**
+* @fileoverview style for content
+* @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
+*/
-COPY ./target/febs-server-job-2.2-RELEASE.jar /febs/febs-server-job-2.2-RELEASE.jar
-ADD agent/ /agent
+.CodeMirror {
+ font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
-ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-job", "-Dskywalking.collector.backend_service=skywalkingIp:11800", "-jar", "/febs/febs-server-job-2.2-RELEASE.jar"]
\ No newline at end of file
+.tui-editor-contents *:not(table) {
+ line-height: 160%;
+ box-sizing: content-box;
+}
+
+.tui-editor-contents i,
+.tui-editor-contents cite,
+.tui-editor-contents em,
+.tu
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
index 46d22c2..769add2 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DeptServiceImpl.java
@@ -74,7 +74,10 @@
.ge(Dept::getCreateTime, dept.getCreateTimeFrom())
.le(Dept::getCreateTime, dept.getCreateTimeTo());
}
- queryWrapper.lambda().in(Dept::getDeptId, userDataPermissionService.findByUserId(FebsUtil.getUserId()).split(StringConstant.COMMA));
+ if (!FebsUtil.getUserId().equals("26")&&!FebsUtil.getUserId().equals("1")) {
+ queryWrapper.lambda().in(Dept::getDeptId, userDataPermissionService.findByUserId(FebsUtil.getUserId()).split(StringConstant.COMMA));
+ }
+
SortUtil.handleWrapperSort(request, queryWrapper, "orderNum", FebsConstant.ORDER_ASC, true);
return this.baseMapper.selectList(queryWrapper);
}
--
Gitblit v1.8.0