Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-14 f32268777e572504f04a845a39d7d425974c5d2f

 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);