更新导出账号接口

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java

@@ -44,6 +44,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -745,7 +746,7 @@ public class SysUserController extends CoreBaseController {
 
     @GetMapping("/export")
     @ApiOperation(value = "导出账号信息", notes = "导出账号信息")
-    public void exportSysUserInfo(SysUser sysUser, HttpServletResponse response) throws Exception {
+    public void exportSysUserInfo(SysUser sysUser, Pager pager, HttpServletResponse response) throws Exception {
         File file = null;
         if (sysUser == null) {
             sysUser = new SysUser();
@@ -753,11 +754,14 @@ public class SysUserController extends CoreBaseController {
         try {
 
             //设置默认值
-            sysUser.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
+//            sysUser.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
-            sysUser.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
+//            sysUser.setIsValid(CommonEnumUtil.IS_VAILD.VAILD.getValue());
-            sysUser.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
+//            sysUser.setIsDeleted(CommonEnumUtil.IS_DEAL.NO.getValue());
-
+            ResultBean resultBean = querySysUserByPager(sysUser, pager);
-            List<SysUser> list = sysUserService.querySysUser(sysUser);
+            List<SysUser> list = resultBean.resultList;
+//            if (!resultBean.isSuccess() || ObjectUtils.isEmpty(resultBean.resultList)) {
+//
+//            }
             List<AccountExportModel> exportModelList = new ArrayList<>();
 
 
@@ -773,7 +777,7 @@ public class SysUserController extends CoreBaseController {
                         user.getUserLoginNum(),
                         user.getUserLoginLastDateTime(),
                         user.getUserStatus())
-                        );
+                );
 
             }