From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index fd5438e..a683e9a 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -347,6 +347,9 @@
user.setHold("2");
}
}
+ if (user.getHold().equals("2")){
+ states = true;
+ }
//如果是离职
if (null != user.getStatus()) {
@@ -887,7 +890,7 @@
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
public R importSecurityTest(MultipartFile file, Integer isCovered, String deptId) {
- SecurityImporterTest securityImporter = new SecurityImporterTest(userService, false, deptId);
+ SecurityImporterTest securityImporter = new SecurityImporterTest(userService);
ExcelUtil.save(file, securityImporter, SecurityExcel.class);
return R.success("操作成功");
}
@@ -1235,6 +1238,8 @@
user.setHold("2");
user.setSecuritynumber(null);
}
+ }else {
+ state = true;
}
String url = "";
--
Gitblit v1.9.3