wenhongquan 3 年之前
父节点
当前提交
c8836f5f86

+ 4 - 1
ruoyi-system/pom.xml

@@ -22,7 +22,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
 
 
     </dependencies>

+ 13 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TableDetectionServiceImpl.java

@@ -1,9 +1,12 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.service.PermissionService;
 import com.ruoyi.system.domain.TblDetectionLog;
 import com.ruoyi.system.domain.TblMaintain;
 import com.ruoyi.system.domain.TblMaintainLog;
@@ -30,6 +33,10 @@ public class TableDetectionServiceImpl implements ITableDetectionService
     @Autowired
     private ITblDetectionLogService detectionLogService;
 
+    @Autowired
+    private PermissionService permissionService;
+
+
     /**
      * 查询检测计划
      * 
@@ -58,6 +65,12 @@ public class TableDetectionServiceImpl implements ITableDetectionService
     @Override
     public List<TableDetection> selectTableDetectionList(TableDetection tableDetection)
     {
+        if(permissionService.hasAnyRoles("common")){
+            Map p = tableDetection.getParams();
+            if(p==null) p = new HashMap<String,Object>();
+            p.put("userId",SecurityUtils.getLoginUser().getUserId()+"");
+            tableDetection.setParams(p);
+        }
         return tableDetectionMapper.selectTableDetectionList(tableDetection);
     }
 

+ 13 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblMaintainServiceImpl.java

@@ -1,9 +1,12 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.service.PermissionService;
 import com.ruoyi.system.domain.TblMaintainLog;
 import com.ruoyi.system.domain.TblTask;
 import com.ruoyi.system.domain.TblTaskLog;
@@ -29,6 +32,10 @@ public class TblMaintainServiceImpl implements ITblMaintainService
     @Autowired
     private ITblMaintainLogService tblMaintainLogService;
 
+    @Autowired
+    private PermissionService permissionService;
+
+
     /**
      * 查询养护计划
      * 
@@ -57,6 +64,12 @@ public class TblMaintainServiceImpl implements ITblMaintainService
     @Override
     public List<TblMaintain> selectTblMaintainList(TblMaintain tblMaintain)
     {
+        if(permissionService.hasAnyRoles("common")){
+            Map p = tblMaintain.getParams();
+            if(p==null) p = new HashMap<String,Object>();
+            p.put("userId",SecurityUtils.getLoginUser().getUserId()+"");
+            tblMaintain.setParams(p);
+        }
         return tblMaintainMapper.selectTblMaintainList(tblMaintain);
     }
 

+ 12 - 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TblTaskServiceImpl.java

@@ -1,12 +1,11 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.service.PermissionService;
 import com.ruoyi.system.domain.TblTaskLog;
 import com.ruoyi.system.mapper.TblTaskLogMapper;
 import com.ruoyi.system.service.ITblTaskLogService;
@@ -31,6 +30,10 @@ public class TblTaskServiceImpl implements ITblTaskService
     @Autowired
     private ITblTaskLogService tblTaskLogService;
 
+
+    @Autowired
+    private PermissionService permissionService;
+
     /**
      * 查询工单任务
      * 
@@ -59,6 +62,12 @@ public class TblTaskServiceImpl implements ITblTaskService
     @Override
     public List<TblTask> selectTblTaskList(TblTask tblTask)
     {
+        if(permissionService.hasAnyRoles("common")){
+            Map p = tblTask.getParams();
+            if(p==null) p = new HashMap<String,Object>();
+            p.put("userId",SecurityUtils.getLoginUser().getUserId()+"");
+            tblTask.setParams(p);
+        }
         List<TblTask> taskList = tblTaskMapper.selectTblTaskList(tblTask);
         for (TblTask t:taskList
              ) {