diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java index 2fb27427..a29ccc09 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/exerciseCard/service/impl/ExerciseCardServiceImpl.java @@ -117,6 +117,7 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl imple Record vwUser = vwUserMap.get(v.getLoginName()); if (vwUser != null) { exerciseCard.setUserId(vwUser.getString("id")); + exerciseCard.setUserId(vwUser.getString("userName")); exerciseCard.setBirthday(DateUtil.parse(vwUser.getString("birthday"), "yyyy-MM-dd")); exerciseCard.setUnionId(vwUser.getString("unionId")); exerciseCard.setUnitId(vwUser.getString("unitId")); @@ -127,7 +128,6 @@ public class ExerciseCardServiceImpl extends BaseServiceImpl imple // 设置其他基本信息 exerciseCard.setLoginName(v.getLoginName()); - exerciseCard.setUserName(v.getUsername()); exerciseCard.setApplyTime(new Date()); // 设置当前时间为申请时间 // 设置额度信息 diff --git a/src/main/resources/views/platform/sys/msg/summary/index.html b/src/main/resources/views/platform/sys/msg/summary/index.html index 921d6bb4..ce3be6c4 100644 --- a/src/main/resources/views/platform/sys/msg/summary/index.html +++ b/src/main/resources/views/platform/sys/msg/summary/index.html @@ -7,19 +7,19 @@ layout("/layouts/platform.html"){ - + - + - + @@ -28,20 +28,20 @@ layout("/layouts/platform.html"){ - - + + - + - + diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js b/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js index d709d6f4..b0a1755d 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js @@ -44,7 +44,7 @@ const ACTIVITY_CULTURE_USER_STATISTICS = { {{ registerCourse.courseName + '报名人员' }}
- - + + - + - + diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js index 4c19d8ce..6d75bcd0 100644 --- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js +++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js @@ -4,15 +4,15 @@ const userInfo = {
{{ registerCourse.courseName + '报名人员' }}
- - + + - + - + diff --git a/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html b/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html index b557a08b..6a464656 100644 --- a/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html +++ b/src/main/resources/views/platform/zhgh/activity/workscollection/read/index.html @@ -30,8 +30,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js index ce74af45..733ed217 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js +++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js @@ -3,13 +3,13 @@ const CLUB_INFO_MANAGE_TEMPLATE = {
- - + + - + - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html index 06f69831..b9db3f04 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html @@ -26,7 +26,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html index c29d2733..2c1080fd 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html @@ -25,7 +25,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html index d05050fe..f9669f3f 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/clothing/apply/index.html @@ -11,7 +11,7 @@ layout("/layouts/platform.html"){