springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -219,4 +219,9 @@ * 项目id */ private Long projectId; /** * 1志愿者活动 2居民活动 3党员活动 4项目活动 */ private Integer type; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1159,6 +1159,9 @@ menu.add(233L); menu.add(237L); } else { menuRoleVO.setIsAll(1); } menuRoleVO.setMenuIds(menu); menuRoleVO.setRoleId(roleId); this.putMenuRole(menuRoleVO); @@ -1368,7 +1371,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 {
