Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-07 ad723be9b0bd0977619caf5ce31b91d04116c70e

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1903,6 +1903,11 @@
        menuRoleVO.setRoleId(roleId);
        this.putMenuRole(menuRoleVO);

        //关联市平台网格员
//        if(eventGridMemberAddDTO.getLcMemberId() != null){
//
//        }

        //参数校验
        SysUserDO oldUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType,6)
                .eq(SysUserDO::getNickName,eventGridMemberAddDTO.getNickName()));