From 8fa32fceb853175e24dd0574647dad099b1ccf47 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 13 十月 2024 22:22:33 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyShareController.java | 10 +++++-----
zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorShareServiceImpl.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 10 +++++-----
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyShareServiceImpl.java | 2 +-
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 6 ++++--
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyShareController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyShareController.java
index 3a343be..0bfb83e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyShareController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAutobiographyShareController.java
@@ -26,7 +26,7 @@
@PostMapping("/share")
public AjaxResult share(@RequestBody ShareMore zfDoctor){
- zfDoctor.setSysMenuId(20106L);
+ zfDoctor.setSysMenuId(2016L);
return zAutobiographyShareService.saveZa(zfDoctor);
}
@@ -35,7 +35,7 @@
*/
@PostMapping("/getInfoByUserId")
public AjaxResult empowerGetInfo(@RequestBody ShareMore zfDoctor){
- zfDoctor.setSysMenuId(20106L);
+ zfDoctor.setSysMenuId(2016L);
Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zAutobiographyShareService.listByFidAid(zfDoctor,pageNo,pageSize) ;
@@ -55,7 +55,7 @@
*/
@PostMapping("/deleteInfoByUserId")
public AjaxResult deleteEmpower(@RequestBody ShareMore zfDoctor){
- zfDoctor.setSysMenuId(20106L);
+ zfDoctor.setSysMenuId(2016L);
return zAutobiographyShareService.deleteZa(zfDoctor);
}
@@ -64,7 +64,7 @@
*/
@PostMapping("/downloadDate")
public AjaxResult ifDownLoad(@RequestBody ZfDownload zfDownload){
- zfDownload.setSysMenuId(20106L);
+ zfDownload.setSysMenuId(2016L);
return zAutobiographyDownloadService.addData(zfDownload);
}
@@ -73,7 +73,7 @@
*/
@GetMapping("/all")
public AjaxResult data(ZfDownload zfDownload){
- zfDownload.setSysMenuId(20106L);
+ zfDownload.setSysMenuId(2016L);
Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NO), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zAutobiographyDownloadService.selectDoctorList(zfDownload,pageNo ,pageSize);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index ce6f04a..5ca7188 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -74,11 +74,11 @@
{
List<SysMenu> menuList = null;
// 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
- if (SysUser.isAdmin(userId))
- {
- menuList = menuMapper.selectMenuList(menu);
- }
- else
+// if (SysUser.isAdmin(userId))
+// {
+// menuList = menuMapper.selectMenuList(menu);
+// }
+// else
{
menu.getParams().put("userId", userId);
menuList = menuMapper.selectMenuListByUserId(menu);
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index ad955d6..4478be9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -50,7 +50,7 @@
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 and m.menu_id in (1, 100, 118)
+ from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 and m.menu_id in (1, 100, 118,2032,2016,2048,2049,2050,2051,2016,2068)
order by m.parent_id, m.order_num
</select>
<select id="selectMenuTreeAllSuperAdmin" resultMap="SysMenuResult">
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 077b262..9051e40 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -223,8 +223,10 @@
*/
private String secondFamilyId;
-
-
+ /**
+ * 鑷垜浠嬬粛
+ */
+ private String self_introduction;
private Long sysId;
/**
* 浠ｆ暟
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyShareServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyShareServiceImpl.java
index eee11a1..54b804e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyShareServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZAutobiographyShareServiceImpl.java
@@ -82,7 +82,7 @@
za.setUserId(getUserId());
za.setShareContent(shareContent);
za.setShareId(shareId);
- za.setSysMenuId(20106L);
+ za.setSysMenuId(2016L);
addData(za);
}
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorShareServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorShareServiceImpl.java
index 826e1b3..27c972d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorShareServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorShareServiceImpl.java
@@ -79,7 +79,7 @@
za.setUserId(getUserId());
za.setShareContent(shareContent);
za.setShareId(shareId);
- za.setSysMenuId(2053L);
+ za.setSysMenuId(2030L);
addData(za);
}
}
--
Gitblit v1.9.1