From cb7edabb2232bc9901725d562a2b4ec56d174a07 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 05 七月 2024 11:32:57 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
index 891c4cd..d7a1add 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
@@ -106,7 +106,15 @@
public static String convertSecondsToHoursMinutes(int seconds) {
int hours = seconds / 3600;
int minutes = (seconds % 3600) / 60;
- return String.format("%d小时%d分钟", hours, minutes);
+ if (hours == 0){
+ if (minutes == 0){
+ return String.format("%d秒", seconds);
+ }else{
+ return String.format("%d分钟", minutes);
+ }
+ }else{
+ return String.format("%d小时%d分钟", hours, minutes);
+ }
}
public static String convertToChineseOrdinal(int number) {
if (number <= 0 || number > 50) {
@@ -182,6 +190,7 @@
return AjaxResult.error("新密码不能与旧密码相同");
}
one.setPassword(SecurityUtils.encryptPassword(password));
+ sysUserService.updateById(one);
return AjaxResult.success();
}
@GetMapping("/sendPhoneCode")
--
Gitblit v1.7.1