lyhzzz 2 anni fa
parent
commit
4edea6a005

+ 12 - 0
src/main/java/com/cdf/controller/back/SysLogController.java

@@ -4,9 +4,13 @@ package com.cdf.controller.back;
 import com.cdf.aop.SysLog;
 import com.cdf.common.PageInfo;
 import com.cdf.common.ResultData;
+import com.cdf.entity.User;
 import com.cdf.request.LogRequest;
 import com.cdf.response.LogVo;
+import com.cdf.service.IDeptService;
 import com.cdf.service.ILogService;
+import com.cdf.service.IUserService;
+import com.cdf.util.JwtUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 
 
 @RestController
@@ -22,11 +27,18 @@ public class SysLogController extends BaseLogController{
 
     @Autowired
     private ILogService logService;
+    @Autowired
+    IUserService userService;
+    @Autowired
+    IDeptService deptService;
 
     @PostMapping("/list")
     @SysLog(logType = "操作日志",value = "查看日志列表")
     public ResultData list(@RequestBody LogRequest param){
         param.setToken(getToken());
+        User user = userService.getById(JwtUtil.getId(getToken()));
+        List<Integer> deptIds = deptService.getDeptIdsSonList(user.getDeptId());
+        param.setDeptIds(deptIds);
         PageInfo<LogVo> pageInfo = logService.getPageByParam(param);
         return ResultData.ok(pageInfo);
     }

+ 6 - 0
src/main/java/com/cdf/service/impl/LogServiceImpl.java

@@ -6,9 +6,11 @@ import com.cdf.entity.Log;
 import com.cdf.mapper.ILogMapper;
 import com.cdf.request.LogRequest;
 import com.cdf.response.LogVo;
+import com.cdf.service.IDeptService;
 import com.cdf.service.ILogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cdf.util.JwtUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -22,6 +24,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class LogServiceImpl extends ServiceImpl<ILogMapper, Log> implements ILogService {
 
+    @Autowired
+    IDeptService deptService;
+
+
     @Override
     public PageInfo<LogVo> getPageByParam(LogRequest param) {
         Page<LogVo> page = getBaseMapper().getPageByParam(new Page<>(param.getPageNum(),param.getPageSize()),param);