From 80bde86f943a8622d39b4d9d0ab056c8829106cd Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期三, 17 三月 2021 01:56:40 +0800
Subject: [PATCH] 智搜导出字段排序修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index d9a5e1a..2a76c36 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
+import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.server.hr.entity.EmpBadRecord;
import cc.mrbird.febs.server.hr.entity.EmpRemarkInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
@@ -78,11 +80,10 @@
}
if (StringUtils.isNotBlank(empRemarkinfo.getEmpStatus())) {
queryWrapper.in("b.EmpStatus", empRemarkinfo.getEmpStatus().split(","));
- } else {
- queryWrapper.in("b.EmpStatus", 0);
}
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
return empRemarkinfoMapper.selectPageVo(page, queryWrapper);
}
@@ -150,7 +151,7 @@
@Transactional(rollbackFor = Exception.class)
public void importEmpRemarkInfo(List<List<Object>> listObject,List<String> returnList) {
for (List<Object> list : listObject) {
- if (list.size()==0){
+ if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
continue;
}
EmpRemarkInfo empRemarkinfo=new EmpRemarkInfo();
--
Gitblit v1.8.0