From e3ee3dac0ef868d7c58295c89003cc35deab16d1 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 17 二月 2021 21:36:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java | 12 ++++++++++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 12 +++++++++++-
febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml | 2 ++
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java | 11 ++++++++---
4 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
index 3f797d6..3214a7f 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
@@ -97,6 +97,12 @@
private String mobile;
/**
+ * 身份證號
+ */
+ @TableField("certificateNumb")
+ private String certificateNumb;
+
+ /**
* 状态 0锁定 1有效
*/
@TableField("STATUS")
@@ -140,6 +146,12 @@
private String avatar;
/**
+ * 头像
+ */
+ @TableField("nickName")
+ private String nickName;
+
+ /**
* 描述
*/
@TableField("DESCRIPTION")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index 430a036..73916b6 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.common.core.entity.system.Role;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.feign.IRemoteUserService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -18,6 +20,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import java.util.List;
import java.util.Map;
/**
@@ -54,7 +57,14 @@
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empBaseInfoService.findEmpBaseInfos(request, empBaseinfo));
return new FebsResponse().data(dataTable);
}
-
+ @GetMapping("options")
+ public FebsResponse roles() {
+ QueryWrapper<EmpBaseInfo> queryWrapper=new QueryWrapper();
+ queryWrapper.eq("delFlag",0);
+ queryWrapper.eq("empStatus",0);
+ List<EmpBaseInfo> allRoles = empBaseInfoService.list(queryWrapper);
+ return new FebsResponse().data(allRoles);
+ }
@ApiOperation(value = "人员基本信息增加")
@PostMapping
@PreAuthorize("hasAuthority('empBaseinfo:add')")
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
index 82d6716..e0451db 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/PositionServiceImpl.java
@@ -61,8 +61,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void createPosition(Position position) {
-position.setCreator(operatorId);
-position.setModifier(operatorId);
+position.setCreator(FebsUtil.getCurrentUsername());
+position.setModifier(FebsUtil.getCurrentUsername());
this.save(position);
}
@@ -100,6 +100,11 @@
public void logicDelPosition(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- positionMapper.logicDeleteByIds(list, operatorId);
+ for (String strs:list){
+ LambdaQueryWrapper<Position> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Position::getPositionId, strs);
+// TODO 设置删除条件
+ this.remove(wrapper);
+ }
}
}
\ No newline at end of file
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
index f8589a9..7973cc3 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/UserMapper.xml
@@ -5,6 +5,8 @@
SELECT
u.user_id userId,
u.username,
+ u.certificateNumb,
+ u.nickName,
u.email,
u.mobile,
u.status,
--
Gitblit v1.8.0