From d2902daad7261ac7d0148dbb9f33f39e52d433f6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 八月 2024 18:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index ceb9bf9..39f5e8b 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -1,11 +1,13 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
+import com.doumee.biz.system.SystemUserBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -17,12 +19,14 @@
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
+import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -48,6 +52,8 @@
@Autowired
private MemberService memberService;
+ @Autowired
+ private SystemUserBiz systemUserBiz;
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
@@ -88,7 +94,7 @@
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
+ memberService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -225,8 +231,6 @@
return ApiResponse.success(null);
}
-
-
@ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@PostMapping("/updateCanVisitById")
@CloudRequiredPermission("business:member:update")
@@ -345,5 +349,13 @@
+ @Trace(withRequestParameters = false)
+ @ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
+ @PostMapping("/updatePwd")
+ public ApiResponse updatePwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated @RequestBody UpdatePwdDto dto) {
+ dto.setUserId(this.getLoginUser(token).getId());
+ systemUserBiz.updatePwd(dto);
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3