三社功能修改

101captain

2022-03-02 0eb263eec26387080f8ab2548b98c955bec6b833

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

@@ -679,6 +679,7 @@
        }
        ComActVO comActVO = userDao.selectCommunity(loginUserInfoVO.getCommunityId());
        if (!ObjectUtils.isEmpty(comActVO)) {
            loginUserInfoVO.setComActVO(comActVO);
            loginUserInfoVO.setCommunityName(comActVO.getName());
        }
        //是否是社区物业人员
@@ -1129,6 +1130,9 @@
                    menu.add(233L);
                    menu.add(237L);
                }
                else {
                    menuRoleVO.setIsAll(1);
                }
                menuRoleVO.setMenuIds(menu);
                menuRoleVO.setRoleId(roleId);
                this.putMenuRole(menuRoleVO);
@@ -1338,7 +1342,7 @@
                        .anyMatch(sysRoleMenuDO -> sysRoleMenuDO.getMenuId().equals(menuId))).collect(Collectors.toList());
            }
            if (!menuIds.isEmpty()) {
                if(menuRoleVO.getMenuIds().isEmpty()){
                if(menuRoleVO.getMenuIds()==null){
                    sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
                }
                else {