feat：删除无用导出字段，导出用户列表数据增加租户校验，系统操作日志记录增加租户标识

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysUserController.java

@@ -73,7 +73,11 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysUser user) {
+    public void export(HttpServletResponse response, SysUser user, List<String> uIds) {
+        if (uIds != null && uIds.size() != 0) {
+            // 导出指定用户集合
+
+        }
         List<SysUser> list = userService.selectUserList(user);
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");

zkqy-business/src/main/java/com/zkqy/business/entity/DragForm.java

@@ -92,13 +92,13 @@ public class DragForm extends BaseEntity {
     /**
      * 备用列
      */
-    @Excel(name = "备用列")
+
     private String spare;
 
     /**
      * 备用列
      */
-    @Excel(name = "备用列")
+
     private String spare1;
 
     //动态表格编号

zkqy-business/src/main/java/com/zkqy/business/entity/DragTable.java

@@ -75,13 +75,13 @@ public class DragTable extends BaseEntity {
     /**
      * 备用列
      */
-    @Excel(name = "备用列")
+
     private String spare;
 
     /**
      * 备用列
      */
-    @Excel(name = "备用列")
+
     private String spare1;
 
     /**

zkqy-framework/src/main/java/com/zkqy/framework/aspectj/LogAspect.java

@@ -88,6 +88,13 @@ public class LogAspect
 
             // *========数据库日志=========*//
             SysOperLog operLog = new SysOperLog();
+            Long tenantId;
+            try {
+                tenantId = SecurityUtils.getTenantId();
+            } catch (Exception exception) {
+                tenantId = 0L;  // 0L 表示当前是admin（租户信息表id自增「自增id不会从0开始」）
+            }
+            operLog.setTenantId(tenantId);
             operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
             // 请求的地址
             String ip = IpUtils.getIpAddr();

zkqy-system/src/main/java/com/zkqy/system/domain/SysOperLog.java

@@ -86,6 +86,10 @@ public class SysOperLog extends BaseEntity
     /** 消耗时间 */
     @Excel(name = "消耗时间", suffix = "毫秒")
     private Long costTime;
+    /**
+     * 租户ID
+     */
+    private Long tenantId;
 
     public Long getOperId()
     {
@@ -266,4 +270,12 @@ public class SysOperLog extends BaseEntity
     {
         this.costTime = costTime;
     }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysUserServiceImpl.java

@@ -71,6 +71,12 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserList(SysUser user) {
+        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+            // 当前用户账号是admin权限，不做处理
+        } else {
+            // 导出当前租户下的数据
+            user.setTenantId(SecurityUtils.getTenantId());
+        }
         return userMapper.selectUserList(user);
     }