From 8998ce958d87e7f04c8cdaed1f72af8fe64d291b Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 14 四月 2021 13:49:23 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 e30a69d..e825482 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
@@ -241,10 +241,13 @@
}
Integer countTeam = userDao.selectCountTeam(phone);
Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
+ Integer isSysUser = userDao.selectCountSysUser(phone);
if(countTeam!=null&&countTeam>0) {
loginUserInfoVO.setIsmemberrole(1);
}else if(selectCountMemberRole!=null&&selectCountMemberRole>0) {
loginUserInfoVO.setIsmemberrole(1);
+ }else if(isSysUser!=null && isSysUser>0){
+ loginUserInfoVO.setIsmemberrole(1);
}
}
return R.ok(loginUserInfoVO);
@@ -404,7 +407,7 @@
@Override
public R listTag() {
List<String> list=new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(null);
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new LambdaQueryWrapper<>());
if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
list=comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
}
@@ -995,7 +998,7 @@
*/
@Override
public R listAgreement() {
- List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(null);
+ List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<>());
if (ObjectUtils.isEmpty(sysUserAgreementDOS)) {
return R.fail();
}
--
Gitblit v1.7.1