From a3b3610216dfeb82c729c914dbb2018da7eb54ef Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 11 六月 2024 09:38:24 +0800
Subject: [PATCH] 组织机构只返回嘉峪关
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 e552d73..2ac39f3 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
@@ -89,11 +89,18 @@
)
})
@GetMapping(path = "some")
+ //@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
public BaseResponse<QueryResultVo<List<VoUserInfo>>> some(QueryVo vo) {
try {
QueryResultVo<List<VoUserInfo>> res = this.sv.selectSome(vo);
- return BaseResponseUtils.buildSuccess(res);
+ if(res.itemTotal == 0) {
+ return BaseResponseUtils.buildFail(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+ }else {
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
+
} catch (Exception e) {
log.error("鏌ヨ鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -142,8 +149,8 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- po.userId = null;
- int count;
+ po.id = null;
+ Long userId;
try {
po.supperAdmin = Constant.no.byteValue() ;
po.disabled = Disabled.NO;//榛樿涓嶇鐢�
@@ -158,13 +165,13 @@
} else {
po.password = MD5.encrypt(defaultPassword);
}
- count = this.sv.save(po);
- this.sv.setRoles(po.userId, po.roleIds);
+ userId = this.sv.save(po);
+ this.sv.setRoles(userId, po.roleIds);
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
- if (count <= 0) {
+ if (userId <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
return BaseResponseUtils.buildSuccess(true);
@@ -192,7 +199,7 @@
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- if (po.userId == null) {
+ if (po.id == null) {
return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D");
}
int count;
@@ -200,8 +207,9 @@
po.supperAdmin = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.deleted = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
po.orgTag = null;//璁剧疆涓簄ull锛屼笉鍋氭洿鏂�
+ po.password = MD5.encrypt(po.password);//杩涜鍔犲瘑
count = this.sv.update(po);
- this.sv.setRoles(po.userId, po.roleIds);
+ this.sv.setRoles(po.id, po.roleIds);
} catch (Exception e) {
log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -495,6 +503,9 @@
public BaseResponse<QueryResultVo<VoUserInfo>> getUserInfos(@PathVariable("userId") Long userId) {
try {
VoUserInfo res = this.sv.getUserInfos(userId);
+ if(res == null) {
+ return BaseResponseUtils.buildException(SystemResultCode.THE_USER_NOT_EXIST.getMessage());
+ }
System.out.println(" :" + res);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
--
Gitblit v1.8.0