From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index 8ad6497..4886a1c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -260,9 +260,11 @@
vo.setStuPhone(ToolUtil.isEmpty(sts.getPhone()) ? "" : sts.getPhone());
vo.setIdCard(ToolUtil.isEmpty(sts.getIdCard()) ? "" : sts.getIdCard());
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
- vo.setBirthday(simpleDateFormat.format(sts.getBirthday()));
vo.setStuName(sts.getName());
- vo.setStuAge(DateUtil.age(sts.getBirthday()));
+ if (sts.getBirthday()!=null){
+ vo.setStuAge(DateUtil.age(sts.getBirthday()));
+ vo.setBirthday(simpleDateFormat.format(sts.getBirthday()));
+ }
vo.setStuHeight(sts.getHeight());
vo.setStuWeight(sts.getWeight());
vo.setIsNot(sts.getIsDefault());
@@ -273,6 +275,7 @@
}
return ResultUtil.success(stuListVos);
} catch (Exception e) {
+ e.printStackTrace();
return ResultUtil.runErr();
}
}
@@ -600,7 +603,7 @@
if (null == appUserId) {
return ResultUtil.tokenErr();
}
- return ResultUtil.success(honorService.queryStuOfMedalData(stuId));
+ return ResultUtil.success(honorService.queryStuOfMedalData(stuId, appUserId));
} catch (Exception e) {
return ResultUtil.runErr();
}
--
Gitblit v1.7.1