From a2735382e853f89465e328dce2df9f3f465bcda9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 17:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/company/src/main/java/com/doumee/api/system/SystemUserController.java |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/system/SystemUserController.java b/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
index 0d14fb7..acebc5d 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -7,10 +7,8 @@
 import com.doumee.core.constants.OperaType;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.CreateSystemUserDTO;
-import com.doumee.dao.system.dto.CreateUserRoleDTO;
-import com.doumee.dao.system.dto.QuerySystemUserDTO;
-import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.system.dto.*;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.dao.system.vo.SystemUserListVO;
 import com.doumee.service.system.SystemUserService;
@@ -106,10 +104,9 @@
     @PostMapping("/page")
     @RequiresPermissions("system:user:query")
     public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) {
+        pageWrap.getModel().setCompanyId(this.getLoginUser().getCompanyId());
         return ApiResponse.success(systemUserService.findPage(pageWrap));
     }
-
-
 
     @ApiOperation("鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛")
     @PostMapping("/findAllList")
@@ -126,4 +123,70 @@
         return ApiResponse.success(systemUserService.findById(id));
     }
 
+    @Trace(withRequestParameters = false)
+    @PreventRepeat
+    @ApiOperation("鏂板缓鍛樺伐")
+    @PostMapping("/companyCreateUser")
+    @RequiresPermissions("system:user:create")
+    public ApiResponse companyCreate(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+        createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
+        systemUserBiz.companyCreateUser(createCompanyUserDTO);
+        return ApiResponse.success(null);
+    }
+
+    @Trace(withRequestParameters = false)
+    @PreventRepeat
+    @ApiOperation("鏂板缓涓绘挱")
+    @PostMapping("/companyCreateAnchor")
+//    @RequiresPermissions("system:user:create")
+    public ApiResponse companyCreateAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+        createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
+        systemUserBiz.companyCreateUser(createCompanyUserDTO);
+        return ApiResponse.success(null);
+    }
+
+
+    @Trace(withRequestParameters = false)
+    @PreventRepeat
+    @ApiOperation("淇敼鍛樺伐淇℃伅")
+    @PostMapping("/companyUpdUser")
+    @RequiresPermissions("system:user:create")
+    public ApiResponse companyUpdUser(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+        createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
+        systemUserBiz.companyUpdUser(createCompanyUserDTO);
+        return ApiResponse.success(null);
+    }
+
+    @Trace(withRequestParameters = false)
+    @PreventRepeat
+    @ApiOperation("淇敼涓绘挱淇℃伅")
+    @PostMapping("/companyUpdAnchor")
+    @RequiresPermissions("system:user:create")
+    public ApiResponse companyUpdAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+        createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
+        systemUserBiz.companyUpdUser(createCompanyUserDTO);
+        return ApiResponse.success(null);
+    }
+
+
+    @PreventRepeat
+    @ApiOperation("淇敼鐢ㄦ埛鐘舵��")
+    @GetMapping("/updUserStatus")
+//    @RequiresPermissions("system:user:create")
+    public ApiResponse updUserStatus( @RequestParam Integer id,@RequestParam Integer status) {
+        systemUserBiz.updUserStatus(id,status);
+        return ApiResponse.success(null);
+    }
+
+
+    @Trace(withRequestParameters = false)
+    @PreventRepeat
+    @ApiOperation("淇敼瀵嗙爜")
+    @PostMapping("/updPassword")
+//    @RequiresPermissions("system:user:create")
+    public ApiResponse updPassword(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+        systemUserBiz.updPassword(createCompanyUserDTO);
+        return ApiResponse.success(null);
+    }
+
 }

--
Gitblit v1.9.3