From 0bbdbca1491a6d042c85e5345c539a180b419cc0 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 17 Mar 2022 14:15:16 +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