From e8ec78cb398d18f484a9de6af590875875fd40a7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 11 一月 2024 14:42:43 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java | 20 +++++++++++++++++++-
lxzn-module-system/lxzn-system-start/src/main/resources/db/2024_1_11(lnl)/lnl.sql | 5 +++++
2 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
index 562dbb1..70413d9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentReportRepairServiceImpl.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,8 +17,12 @@
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
import org.jeecg.modules.eam.vo.RepairReportExportVo;
+import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.mapper.SysRoleMapper;
import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.mapper.SysUserRoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,6 +47,10 @@
private ISysBaseAPI sysBaseApi;
@Autowired
private SysUserMapper userMapper;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+ @Autowired
+ private SysRoleMapper sysRoleMapper;
/**
* 鏁呴殰鎶ヤ慨娣诲姞
*
@@ -102,7 +112,15 @@
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
if(StringUtils.isNotBlank((String)params.get("userId"))){
SysUser sysUser = userMapper.selectById((String)params.get("userId"));
- params.put("teamId",sysUser.getTeamId());
+ SysRole sysRole = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("role_code","AcceptAllRepair"));
+ if(ObjectUtils.isNull(sysRole)){
+ params.put("teamId",sysUser.getTeamId());
+ }else {
+ SysUserRole sysUserRole = sysUserRoleMapper.selectOne(new QueryWrapper<SysUserRole>().eq("user_id",sysUser.getId()).eq("role_id",sysRole.getId()));
+ if(ObjectUtils.isNull(sysUserRole)){
+ params.put("teamId",sysUser.getTeamId());
+ }
+ }
}
List<String> equipNums = new ArrayList<>();
if(StringUtils.isNotBlank((String)params.get("nums"))){
diff --git "a/lxzn-module-system/lxzn-system-start/src/main/resources/db/2024_1_11\050lnl\051/lnl.sql" "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2024_1_11\050lnl\051/lnl.sql"
new file mode 100644
index 0000000..94f7be7
--- /dev/null
+++ "b/lxzn-module-system/lxzn-system-start/src/main/resources/db/2024_1_11\050lnl\051/lnl.sql"
@@ -0,0 +1,5 @@
+INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1745311913753559042', N'1638420030147723265', N'璁￠噺妫�娴嬭澶�', N'/eam/EquipmentListOfMetrological', N'eam/EquipmentListOfMetrological', NULL, NULL, 1, NULL, N'1', 10.1, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2024-01-11 13:09:21.0000000', N'admin', '2024-01-11 13:09:57.1730000', 0, NULL, N'1', 0);
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745294580473511937', N'1695985281980776449', N'璁￠噺妫�娴嬭澶�', N'metrological', '', 15, 1, N'admin', '2024-01-11 12:00:28.6580000', NULL, NULL);
+
+INSERT INTO [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745327833121144834', N'鎵�鏈変繚淇崟鎺ユ敹浜�', N'AcceptAllRepair', NULL, N'admin', '2024-01-11 14:12:36.6980000', NULL, NULL);
--
Gitblit v1.9.3