From 1376d5627f5f41fce93d51235f5bcc1255586184 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 06 六月 2024 15:51:34 +0800 Subject: [PATCH] 2024-06-06 朱宝民 优化回调处理 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 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 86e6440..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 @@ -9,6 +9,7 @@ import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; import com.dy.common.webUtil.ResultCodeMsg; +import com.dy.pipIrrBase.result.SystemResultCode; import com.dy.pipIrrGlobal.pojoBa.BaUser; import com.dy.pipIrrGlobal.util.Constant; import com.dy.pipIrrGlobal.voBa.VoUserInfo; @@ -88,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,7 +150,7 @@ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } po.id = null; - int count; + Long userId; try { po.supperAdmin = Constant.no.byteValue() ; po.disabled = Disabled.NO;//榛樿涓嶇鐢� @@ -157,13 +165,13 @@ } else { po.password = MD5.encrypt(defaultPassword); } - count = this.sv.save(po); - this.sv.setRoles(po.id, 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); @@ -199,6 +207,7 @@ 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.id, po.roleIds); } catch (Exception e) { @@ -469,7 +478,7 @@ return BaseResponseUtils.buildException(e.getMessage()); } if (count <= 0) { - return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�"); + return BaseResponseUtils.buildFail(SystemResultCode.USER_NOT_EXIST.getMessage()); } else { return BaseResponseUtils.buildSuccess(true); } @@ -494,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