From ba65d13496e6421904e603cdcfe63513b8a50034 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 07 十二月 2023 11:19:14 +0800
Subject: [PATCH] 文件误删除后，本地重新找回后提交
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index 3bfc625..dec9d8a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -115,7 +115,6 @@
}
po.id = null;
int count;
- int count1;
try {
po.disabled = Disabled.NO;//榛樿涓嶇鐢�
po.deleted = Deleted.NO;//榛樿涓嶅垹闄�
@@ -130,12 +129,12 @@
po.password = MD5.encrypt(defaultPassword);
}
count = this.sv.save(po);
- count1 = this.sv.setRoles(String.valueOf(po.id), po.roleIds);
+ this.sv.setRoles(po.id, po.roleIds);
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
- if (count <= 0 || count1 <= 0) {
+ if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
return BaseResponseUtils.buildSuccess(true);
@@ -171,6 +170,7 @@
po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.orgTag = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
count = this.sv.update(po);
+ this.sv.setRoles(po.id, po.roleIds);
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -250,7 +250,7 @@
* @param id 鐢ㄦ埛ID
* @return 鏄惁鎴愬姛
*/
- @Operation(summary = "閲嶇疆瀵嗙爜", description = "鎻愪氦鐢ㄦ埛ID")
+ @Operation(summary = "閲嶇疆瀵嗙爜涓洪粯璁ゅ瘑鐮�", description = "鎻愪氦鐢ㄦ埛ID")
@ApiResponses(value = {
@ApiResponse(
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
@@ -259,9 +259,9 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "resetPassword", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "resetPasswordByDefault", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> resetPassword(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
+ public BaseResponse<Boolean> resetPasswordByDefault(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -292,7 +292,7 @@
* @param id 鐢ㄦ埛ID
* @return 鏄惁鎴愬姛
*/
- @Operation(summary = "閲嶇疆瀵嗙爜", description = "鎻愪氦鐢ㄦ埛ID")
+ @Operation(summary = "閲嶇疆瀵嗙爜涓洪殢鏈烘暟瀛楀姞瀛楁瘝", description = "鎻愪氦鐢ㄦ埛ID")
@ApiResponses(value = {
@ApiResponse(
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
@@ -301,9 +301,9 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "resetPassword1", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "resetPasswordByRandom", consumes = MediaType.TEXT_PLAIN_VALUE)
@SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<String> resetPassword1(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
+ public BaseResponse<String> resetPasswordByRandom(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
}
@@ -331,11 +331,12 @@
/**
+ * 2023-12-05 鍦� save鍜寀pdate鏂规硶涓繘琛屼簡瑙掕壊璁剧疆鍏宠仈锛屾湰鏂规硶搴熷純
* 璁剧疆鐢ㄦ埛瑙掕壊
*
* @param id 鐢ㄦ埛ID
* @return 鏄惁鎴愬姛
- */
+
@Operation(summary = "璁剧疆鐢ㄦ埛瑙掕壊", description = "鎻愪氦鐢ㄦ埛ID锛屽強鎵�閫夋嫨鐨勮鑹睮D闆嗗悎锛堟暟缁勶級")
@ApiResponses(value = {
@ApiResponse(
@@ -365,7 +366,7 @@
}
return BaseResponseUtils.buildSuccess(true);
}
-
+ */
/**
* 鍒犻櫎鐢ㄦ埛
--
Gitblit v1.8.0