diff --git a/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java b/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java
index 916b7c4..73911bf 100644
--- a/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java
+++ b/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java
@@ -131,8 +131,8 @@ public class SysMenuController extends AbstractController {
 		sysObjectLanguageMenu.setLanguageValue(menu.getName());
 		BeanUtils.copyProperties(menu,sysMenuEntity);
 		sysMenuService.save(sysMenuEntity);
-		sysObjectLanguageMenu.setMenuId(sysMenuEntity.getMenuId());
-		sysObjectLanguageMenuService.saveSysObjectLanguageMenu(sysObjectLanguageMenu);
+//		sysObjectLanguageMenu.setMenuId(sysMenuEntity.getMenuId());
+//		sysObjectLanguageMenuService.saveSysObjectLanguageMenu(sysObjectLanguageMenu);
 		return R.ok();
 	}
 	
@@ -145,7 +145,6 @@ public class SysMenuController extends AbstractController {
 	public R update(@RequestBody SysMenuEntity menu){
 		//数据校验
 		verifyForm(menu);
-				
 		sysMenuService.updateById(menu);
 		
 		return R.ok();
diff --git a/src/main/java/com/gaotao/modules/sys/controller/UserFavoriteMenuController.java b/src/main/java/com/gaotao/modules/sys/controller/UserFavoriteMenuController.java
new file mode 100644
index 0000000..bba3892
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/sys/controller/UserFavoriteMenuController.java
@@ -0,0 +1,42 @@
+package com.gaotao.modules.sys.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gaotao.common.utils.R;
+import com.gaotao.modules.sys.entity.FavoriteFunctions;
+import com.gaotao.modules.sys.entity.SysMenuEntity;
+import com.gaotao.modules.sys.service.FavoriteFunctionsService;
+import oracle.jdbc.proxy.annotation.Post;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("userFavorite")
+public class UserFavoriteMenuController {
+
+    @Resource
+    private FavoriteFunctionsService favoriteFunctionsService;
+
+    @GetMapping("userFavoriteList/{userId}/{languageCode}")
+    public R userMenuFavoriteList(@PathVariable("userId")Long userId,@PathVariable("languageCode")String languageCode){
+        List<SysMenuEntity> sysMenuEntities = favoriteFunctionsService.userMenuFavoriteList(userId, languageCode);
+        return R.ok().put("list",sysMenuEntities);
+    }
+
+    @PostMapping("save")
+    public R saveUserMenuFavorite(@RequestBody FavoriteFunctions favoriteFunctions){
+
+       favoriteFunctionsService.save(favoriteFunctions);
+        return R.ok("收藏成功");
+    }
+
+    @PostMapping("remove")
+    public R removeUserMenuFavorite(@RequestBody FavoriteFunctions favoriteFunctions){
+        QueryWrapper<FavoriteFunctions> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id",favoriteFunctions.getUserId())
+                .eq("function_id",favoriteFunctions.getFunctionId());
+        favoriteFunctionsService.remove(queryWrapper);
+        return R.ok("取消收藏");
+    }
+}
diff --git a/src/main/java/com/gaotao/modules/sys/dao/FavoriteFunctionsDao.java b/src/main/java/com/gaotao/modules/sys/dao/FavoriteFunctionsDao.java
new file mode 100644
index 0000000..ffec3b7
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/sys/dao/FavoriteFunctionsDao.java
@@ -0,0 +1,14 @@
+package com.gaotao.modules.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gaotao.modules.sys.entity.FavoriteFunctions;
+import com.gaotao.modules.sys.entity.SysMenuEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface FavoriteFunctionsDao extends BaseMapper<FavoriteFunctions> {
+    List<SysMenuEntity> userMenuFavoriteList(@Param("userId") Long userId,@Param("languageCode") String languageCode);
+}
diff --git a/src/main/java/com/gaotao/modules/sys/entity/FavoriteFunctions.java b/src/main/java/com/gaotao/modules/sys/entity/FavoriteFunctions.java
new file mode 100644
index 0000000..e3bb5bf
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/sys/entity/FavoriteFunctions.java
@@ -0,0 +1,10 @@
+package com.gaotao.modules.sys.entity;
+
+import lombok.Data;
+
+@Data
+public class FavoriteFunctions {
+
+    private Long userId;
+    private Long functionId;
+}
diff --git a/src/main/java/com/gaotao/modules/sys/service/FavoriteFunctionsService.java b/src/main/java/com/gaotao/modules/sys/service/FavoriteFunctionsService.java
new file mode 100644
index 0000000..7fb09ef
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/sys/service/FavoriteFunctionsService.java
@@ -0,0 +1,15 @@
+package com.gaotao.modules.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gaotao.modules.sys.entity.FavoriteFunctions;
+import com.gaotao.modules.sys.entity.SysMenuEntity;
+
+import java.util.List;
+
+public interface FavoriteFunctionsService extends IService<FavoriteFunctions> {
+
+    List<SysMenuEntity> userMenuFavoriteList(Long userId, String languageCode);
+
+
+
+}
diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/FavoriteFunctionsServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/FavoriteFunctionsServiceImpl.java
new file mode 100644
index 0000000..666769c
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/sys/service/impl/FavoriteFunctionsServiceImpl.java
@@ -0,0 +1,19 @@
+package com.gaotao.modules.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gaotao.modules.sys.dao.FavoriteFunctionsDao;
+import com.gaotao.modules.sys.entity.FavoriteFunctions;
+import com.gaotao.modules.sys.entity.SysMenuEntity;
+import com.gaotao.modules.sys.service.FavoriteFunctionsService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("favoriteFunctionsService")
+public class FavoriteFunctionsServiceImpl extends ServiceImpl<FavoriteFunctionsDao, FavoriteFunctions> implements FavoriteFunctionsService {
+
+    public List<SysMenuEntity> userMenuFavoriteList(Long userId,String languageCode){
+        List<SysMenuEntity> sysMenuEntities = baseMapper.userMenuFavoriteList(userId, languageCode);
+        return sysMenuEntities;
+    }
+}
diff --git a/src/main/resources/mapper/sys/FavoriteFunctionsDao.xml b/src/main/resources/mapper/sys/FavoriteFunctionsDao.xml
new file mode 100644
index 0000000..2e46987
--- /dev/null
+++ b/src/main/resources/mapper/sys/FavoriteFunctionsDao.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gaotao.modules.sys.dao.FavoriteFunctionsDao">
+
+
+    <select id="userMenuFavoriteList" resultType="com.gaotao.modules.sys.entity.SysMenuEntity">
+        SELECT
+            sm.icon,
+            sm.item_type,
+            sm.menu_id,
+            ISNULL(slm.language_value,sm.name) as name,
+            sm.order_num,
+            sm.parent_id,
+            sm.url,
+            sm.perms,
+            sm.type
+        FROM
+            favorite_functions ff
+                LEFT JOIN sys_object_language_menu slm ON (slm.menu_id = ff.function_id)
+                LEFT JOIN sys_menu sm ON (slm.menu_id = sm.menu_id)
+        WHERE ff.user_id = #{userId} and slm.language_code = #{languageCode}
+    </select>
+</mapper>
\ No newline at end of file