From ba90001d9816117ac0383a03db4ae6d1524ff0ab Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 15 Jun 2023 13:55:55 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/sys/SysUserController.java     | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
index 8d0b3736ce..0280705821 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
@@ -4,31 +4,28 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.auth.annotation.DeLog;
-import io.dataease.auth.annotation.DePermission;
 import io.dataease.auth.annotation.SqlInjectValidator;
 import io.dataease.auth.api.dto.CurrentUserDto;
 import io.dataease.auth.entity.AccountLockStatus;
 import io.dataease.auth.service.AuthUserService;
-import io.dataease.commons.constants.DePermissionType;
-import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.commons.constants.SysLogConstants;
 import io.dataease.commons.exception.DEException;
-import io.dataease.commons.utils.BeanUtils;
-import io.dataease.controller.sys.request.KeyGridRequest;
-import io.dataease.controller.sys.response.AuthBindDTO;
-import io.dataease.exception.DataEaseException;
-import io.dataease.i18n.Translator;
-import io.dataease.plugins.common.base.domain.SysRole;
 import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
 import io.dataease.controller.response.ExistLdapUser;
 import io.dataease.controller.sys.base.BaseGridRequest;
+import io.dataease.controller.sys.request.KeyGridRequest;
 import io.dataease.controller.sys.request.SysUserCreateRequest;
 import io.dataease.controller.sys.request.SysUserPwdRequest;
 import io.dataease.controller.sys.request.SysUserStateRequest;
+import io.dataease.controller.sys.response.AuthBindDTO;
 import io.dataease.controller.sys.response.RoleUserItem;
 import io.dataease.controller.sys.response.SysUserGridResponse;
+import io.dataease.exception.DataEaseException;
+import io.dataease.i18n.Translator;
+import io.dataease.plugins.common.base.domain.SysRole;
 import io.dataease.plugins.common.base.domain.SysUser;
 import io.dataease.plugins.common.base.domain.SysUserAssist;
 import io.dataease.service.sys.SysRoleService;
@@ -37,7 +34,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -87,27 +84,22 @@ public class SysUserController {
         users.forEach(user -> {
             AccountLockStatus accountLockStatus = authUserService.lockStatus(user.getUsername(), user.getFrom());
             user.setLocked(accountLockStatus.getLocked());
+            user.setPassword(null);
         });
         return PageUtils.setPageInfo(page, users);
     }
 
-    @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
-    @PostMapping("/userGrid/{datasetId}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", name = "goPage", value = "页码", required = true, dataType = "Integer"),
-            @ApiImplicitParam(paramType = "path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "request", value = "查询条件", required = true)
-    })
-    public Pager<List<SysUserGridResponse>> userGrids(@PathVariable String datasetId, @RequestBody KeyGridRequest request) {
-       return userGrid(0, 0, request);
-    }
-
     @ApiIgnore
     @PostMapping("/userLists")
     @SqlInjectValidator({"nick_name", "create_time"})
     public List<SysUserGridResponse> userLists(@RequestBody BaseGridRequest request) {
         KeyGridRequest keyGridRequest = BeanUtils.copyBean(new KeyGridRequest(), request);
-        return sysUserService.query(keyGridRequest);
+        List<SysUserGridResponse> users = sysUserService.query(keyGridRequest);
+        if (CollectionUtils.isEmpty(users)) return users;
+        users.forEach(user -> {
+            user.setPassword(null);
+        });
+        return users;
     }
 
     @ApiOperation("创建用户")
@@ -227,7 +219,7 @@ public class SysUserController {
             @ApiImplicitParam(paramType = "path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "request", value = "查询条件", required = true)
     })
-    @SqlInjectValidator({"create_time",  "update_time"})
+    @SqlInjectValidator({"create_time", "update_time"})
     public Pager<List<SysRole>> roleGrid(@PathVariable int goPage, @PathVariable int pageSize,
                                          @RequestBody BaseGridRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);