From 1435be1dbe6e404cf45d81da4d47fea5fd51b24d Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 21 四月 2021 11:25:20 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 2471ff2..00fbcdb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -752,8 +752,8 @@
                 sysRoleDO.setRoleKey("chaojiguanliyuan" + communityId);
             }else{
                 sysRoleDO.setCommunityId(0L);
-                sysRoleDO.setRoleName(administratorsUserVO.getShopStoreName());
-                sysRoleDO.setRoleKey("shanghupingtai" + administratorsUserVO.getShopStorePhone());
+                sysRoleDO.setRoleName("商城管理员");
+                sysRoleDO.setRoleKey("shanghupingtai" + administratorsUserVO.getAccount());
             }
             sysRoleDO.setRoleSort(0);
             sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
@@ -1560,8 +1560,10 @@
     }
 
     @Override
-    public R getSysUserVOByAccount(String account) {
-        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, account));
+    public R getSysUserVOByAccount(String account, Integer type) {
+        LambdaQueryWrapper<SysUserDO> query = new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount, account);
+        query.eq(SysUserDO::getType, type);
+        SysUserDO sysUserDO = userDao.selectOne(query);
         if (ObjectUtils.isEmpty(sysUserDO)) {
             return R.fail("用户不存在");
         }

--
Gitblit v1.7.1