From adcff04c70567f4b1e74ec2c8dcecbb5164f94ec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Sep 2022 09:43:35 +0800
Subject: [PATCH] 1、增加轮播图维护 2、修复队伍接口报错

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 be87d52..a023a6a 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
@@ -502,6 +502,14 @@
 	public List<UserRegisterStatisVO> getUserTypeCount() {
 		return baseMapper.getUserTypeCount();
 	}
+	@Override
+	public List<UserRegisterStatisVO> getUserTypeCountXq(String xid) {
+		return baseMapper.getUserTypeCountXq(xid);
+	}
+	@Override
+	public List<UserVO> getUserTypeList(String xid,String index) {
+		return baseMapper.getUserTypeList(xid,index);
+	}
 
 	@Override
 	public List<UserDistrictStatisVO> getUserDistrictTypeCount() {
@@ -532,6 +540,10 @@
 	public void updateAcc(String stype, String account) {
 		baseMapper.updateAcc(stype, account);
 	}
+	@Override
+	public boolean firstLogin(String id) {
+		return baseMapper.firstLogin(id);
+	}
 
 	@Override
 	public void delete(String account) {
@@ -550,11 +562,17 @@
 			User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
 			// 设置租户ID
 			user.setTenantId("000000");
+			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