diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserPersonalMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserPersonalMenuService.java
index 35694bc8..3ec6ace4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserPersonalMenuService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserPersonalMenuService.java
@@ -22,7 +22,7 @@ public interface ISarUserPersonalMenuService extends IService<SarUserPersonalMen
 
     public ResponseMessage<IPage<SarUserPersonalMenu>> updateUserPersonalMenu(SarUserPersonalMenuEO eo);
 
-    public void updateUserPersonalMenuForRole(List<SarUserPersonalMenu> menus);
+    public void updateUserPersonalMenuForRole(List<SarUserPersonalMenu> menus,String userId);
 
 
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
index 4a1320b5..42b8052d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
@@ -1,15 +1,18 @@
 package com.adc.da.slrs.sarPersonalCenter.service.impl;
 
 import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
 import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenu;
 import com.adc.da.slrs.sarPersonalCenter.dao.SarUserPersonalMenuDao;
 import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenuEO;
 import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -25,16 +28,77 @@ public class SarUserPersonalMenuServiceImpl extends ServiceImpl<SarUserPersonalM
 
     @Override
     public ResponseMessage<IPage<SarUserPersonalMenu>> getUserPersonalMenu(SarUserPersonalMenuEO eo) {
-        return null;
+        if(eo.getUserId()==null||eo.getUserId().trim().length()==0){
+            return Result.error("userId不能为空");
+        }
+        QueryWrapper<SarUserPersonalMenu> queryWrapper=new QueryWrapper<>();
+        queryWrapper.eq("user_id",queryWrapper);
+        if(eo.getMenuUrl()!=null)queryWrapper.eq("menu_url",eo.getMenuUrl());
+        if(eo.getMenuName()!=null&&eo.getMenuName().trim().length()>0)queryWrapper.like("menu_name",eo.getMenuName().trim());
+        if(eo.getState()!=null)queryWrapper.eq("state",eo.getState());
+
+        IPage<SarUserPersonalMenu> iPage=new Page<>(eo.getCurrent(),eo.getSize());
+        IPage<SarUserPersonalMenu> page = page(iPage, queryWrapper);
+        while (page.getRecords().remove(null));
+        return Result.success(page);
     }
 
     @Override
     public ResponseMessage<IPage<SarUserPersonalMenu>> updateUserPersonalMenu(SarUserPersonalMenuEO eo) {
-        return null;
+        if(eo.getUserId()==null||eo.getUserId().trim().length()==0){
+            return Result.error("userId不能为空");
+        }
+        List<SarUserPersonalMenu> menus=new ArrayList<>();
+        if(eo.getSarUserPersonalMenus()!=null){
+            for (SarUserPersonalMenu menu : eo.getSarUserPersonalMenus()) {
+                if(menu.getId()!=null&&menu.getId().trim().length()>0&&menu.getState()!=null){
+
+                    SarUserPersonalMenu sarUserPersonalMenu=new SarUserPersonalMenu();
+                    sarUserPersonalMenu.setState(menu.getState()==0?0:1);
+                    QueryWrapper<SarUserPersonalMenu> queryWrapper=new QueryWrapper<>();
+                    queryWrapper.eq("user_id",eo.getUserId());
+                    queryWrapper.eq("id",menu.getId());
+
+                    update(sarUserPersonalMenu,queryWrapper);
+                }
+            }
+        }
+
+        return getUserPersonalMenu(eo);
     }
 
     @Override
-    public void updateUserPersonalMenuForRole(List<SarUserPersonalMenu> menus) {
+    public void updateUserPersonalMenuForRole(List<SarUserPersonalMenu> menuList,String userId) {
+
+        Set<String> ids=new HashSet<>();
+
+        for (SarUserPersonalMenu menu : menuList) {
+            if(menu.getMenuId()!=null&&menu.getMenuId().trim().length()>0){
+
+                QueryWrapper<SarUserPersonalMenu> queryWrapper=new QueryWrapper<>();
+                queryWrapper.eq("user_id",userId);
+                queryWrapper.eq("menu_id",menu.getMenuId());
+                List<SarUserPersonalMenu> menus = getBaseMapper().selectList(queryWrapper);
+                if (menus.size()>0) {
+                    ids.add(menus.get(0).getId());
+                    continue;
+                }
+
+                SarUserPersonalMenu sarUserPersonalMenu=new SarUserPersonalMenu();
+                sarUserPersonalMenu.setMenuName(menu.getMenuName());
+                sarUserPersonalMenu.setMenuUrl(menu.getMenuUrl());
+                sarUserPersonalMenu.setUserId(menu.getUserId());
+                sarUserPersonalMenu.setMenuId(menu.getMenuId());
+                sarUserPersonalMenu.setState(0);
+
+                getBaseMapper().insert(sarUserPersonalMenu);
+                ids.add(sarUserPersonalMenu.getId());
+            }
+        }
+        QueryWrapper<SarUserPersonalMenu> queryWrapper=new QueryWrapper<>();
+        queryWrapper.notIn("id",ids);
+        queryWrapper.eq("user_id",userId);
+        getBaseMapper().delete(queryWrapper);
 
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
index cc1b7309..890d219d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
@@ -74,14 +74,14 @@ public class SarUserStarServiceImpl extends ServiceImpl<SarUserStarDao, SarUserS
         if (sarUserStars.getUserId() == null) {
             return Result.error("userId不能为空");
         }
-        if (!(sarUserStars.getId() == null && sarUserStars.getUrl() == null)) {
+        if ((sarUserStars.getId() == null && sarUserStars.getUrl() == null)) {
             return Result.error("url或id不能为空");
         }
         QueryWrapper<SarUserStar> sarUserStarQueryWrapper = new QueryWrapper<>();
         if(sarUserStars.getId()!=null)sarUserStarQueryWrapper.eq("id", sarUserStars.getId());
         else sarUserStarQueryWrapper.eq("url", sarUserStars.getUrl());
         sarUserStarQueryWrapper.eq("user_id", sarUserStars.getUserId());
-        iSarUserStarService.remove(sarUserStarQueryWrapper);
+
 
         return Result.success(iSarUserStarService.remove(sarUserStarQueryWrapper));
     }