From 02e96b9104ef041ddc52db482301923b9c40fea6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 05 Jun 2021 17:39:01 +0800
Subject: [PATCH] 1.处警管理新增用户修改，判空条件位置修改，防止空指针异常 2.处境队伍查询条件新增账户模糊查询
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index bd1d254..3409c13 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -30,14 +30,13 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringPool;
+import org.springblade.system.entity.Role;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.excel.UserImporter;
@@ -152,10 +151,10 @@
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- if (user.getOnline_status().equals("") || user.getOnline_status() == null){
+ if (user.getOnline_status() == null || user.getOnline_status().equals("")){
user.setOnline_status("0");
}
- if (user.getWork_status().equals("") || user.getWork_status() == null){
+ if (null == user.getWork_status() || user.getWork_status().equals("")){
user.setWork_status("0");
}
@@ -177,7 +176,6 @@
if (user.getWork_status().equals("") || user.getWork_status() == null){
user.setWork_status("0");
}
-
return R.status(userService.updateUser(user));
}
--
Gitblit v1.9.3