diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java index b067979b..8cfc2d16 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java @@ -93,12 +93,15 @@ public class SysDepartRoleController extends JeecgController pageList = sysDepartRoleService.page(page, queryWrapper); + return Result.ok(pageList); + }else{ + return Result.ok(null); } - - IPage pageList = sysDepartRoleService.page(page, queryWrapper); - return Result.ok(pageList); + //update-end---author:chenrui ---date:20250107 for:[QQYUN-10775]验证码可以复用 #7674------------ } /** diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index a4f12768..2bd0a8e8 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -748,7 +748,10 @@ public class SysUserController { if(oConvertUtils.isEmpty(depId)){ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); int userIdentity = user.getUserIdentity() != null?user.getUserIdentity():CommonConstant.USER_IDENTITY_1; - if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 ){ + //update-begin---author:chenrui ---date:20250107 for:[QQYUN-10775]验证码可以复用 #7674------------ + if(oConvertUtils.isNotEmpty(userIdentity) && userIdentity == CommonConstant.USER_IDENTITY_2 + && oConvertUtils.isNotEmpty(user.getDepartIds())) { + //update-end---author:chenrui ---date:20250107 for:[QQYUN-10775]验证码可以复用 #7674------------ subDepids = sysDepartService.getMySubDepIdsByDepId(user.getDepartIds()); } }else{ @@ -1873,4 +1876,28 @@ public class SysUserController { sysUserService.sendChangePhoneSms(jsonObject, username, ipAddress); return Result.ok("发送验证码成功!"); } + + /** + * 发送注销用户手机号验证密码[敲敲云专用] + * + * @param jsonObject + * @return + */ + @PostMapping(value = "/sendLogOffPhoneSms") + public Result sendLogOffPhoneSms(@RequestBody JSONObject jsonObject, HttpServletRequest request) { + Result result = new Result<>(); + //获取登录用户名 + String username = JwtUtil.getUserNameByToken(request); + String name = jsonObject.getString("username"); + if (oConvertUtils.isEmpty(name) || !name.equals(username)) { + result.setSuccess(false); + result.setMessage("发送验证码失败,用户不匹配!"); + return result; + } + String ipAddress = IpUtils.getIpAddr(request); + sysUserService.sendLogOffPhoneSms(jsonObject, username, ipAddress); + result.setSuccess(true); + result.setMessage("发送验证码成功!"); + return result; + } }