From 37d57abd8bc8aa69a2518f693a2c971de8a08859 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Sep 2023 19:26:43 +0800
Subject: [PATCH] 任务查询报错修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index c228aab..a11b192 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -354,7 +354,7 @@
}
@Override
- public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
+ public List<UserExcel> exportUser(User queryWrapper) {
List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
userList.forEach(user -> {
user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
@@ -565,11 +565,14 @@
user.setRoleId("1495714343888039937");
user.setDeptId("1424615972718895106");
user.setStype("1");
+ user.setIsDeleted(0);
+ user.setStatus(1);
//查询身份证号是否有重复的,有的话只更新
User user1 = new User();
- user1.setCardid(user.getCardid());
user1.setStatus(1);
user1.setIsDeleted(0);
+ //设置保安员id
+ user1.setSecurityId(userExcel.getSecurityId());
List<User> list = this.list(Condition.getQueryWrapper(user1));
if (list.size()>0){
//更新
--
Gitblit v1.9.3