From 4bcf8051886a6666d8209e43eb20a184d091824e Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 16 十一月 2022 09:29:46 +0800
Subject: [PATCH] Merge commit 'e41ec4ec32db3c3476489dd39cd7a972280aa636' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index 7939bda..bf9c819 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -92,7 +92,7 @@
newUser.setUserId(huaChengSysUser.getUserId()+"");
newUser.setLoginName(huaChengSysUser.getPhone());
newUser.setUserName(huaChengSysUser.getNickName());
- newUser.setUserType("4");
+ newUser.setUserType("3");
newUser.setPhonenumber(huaChengSysUser.getPhone());
newUser.setSex(huaChengSysUser.getSex());
newUser.setAvatar(huaChengSysUser.getImageUrl());
@@ -254,8 +254,8 @@
}
@Override
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
- return baseMapper.selectConfigList(page, state,userType,userName,ids);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids,String isDivisionHead) {
+ return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
}
@Override
--
Gitblit v1.7.1