diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java b/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java index 210d25ce4..2fd7e88a8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java @@ -13,7 +13,7 @@ import java.text.SimpleDateFormat; * 后台消息 */ public class NoticeInfo { - private final DateFormat format = new SimpleDateFormat("yyyyMMdd"); + private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); @NotNull private String title; private String desc; diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java index 170fb31ab..829853346 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java @@ -101,16 +101,17 @@ public class NoticeManageImpl implements NoticeManage { notice.put("create_id", manager.getString("manager_id")); notice.put("create_name", manager.getString("display_name")); if (!notice.getBoolean("merchants_type")){ - String sendClients = ""; + StringBuilder sendClients = new StringBuilder(); List clients = clientMapper.listValidClient(); clients.forEach(c -> { - String p = c+","; - sendClients.concat(p); + if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){ + String p = c.getString("client_moniker")+","; + sendClients.append(p); + } }); if (sendClients.length()>0){ - sendClients.substring(0,sendClients.length()-1); + notice.put("send_clients",sendClients.substring(0,sendClients.length()-1)); } - notice.put("send_clients",sendClients); } noticeManageMapper.createNotice(notice); diff --git a/src/main/ui/static/config/notice/notice.js b/src/main/ui/static/config/notice/notice.js index a0ff19ace..49f8d8aae 100644 --- a/src/main/ui/static/config/notice/notice.js +++ b/src/main/ui/static/config/notice/notice.js @@ -102,7 +102,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' } var notice = angular.copy($scope.notice); if (notice.end_time) { - notice.end_time = $filter('date')(notice.end_time, 'yyyyMMdd') + notice.end_time = $filter('date')(notice.end_time, 'yyyy-MM-dd') } if (notice.merchants_type == 1) { if (notice.send_clients.length == 0) { @@ -189,7 +189,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' $scope.saveNoticeResult = false; commonDialog.alert({title: 'Success', content: 'Send a notice successfully', type: 'success'}); $scope.$close(); - $state.go('notice.detail', {notice_id: $scope.notice.notice_id}) + $state.go('^.detail', {notice_id: $scope.notice.notice_id},{reload:true}) }, function (resp) { $scope.saveNoticeResult = false; commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); @@ -220,7 +220,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' } var notice = angular.copy($scope.notice); if (notice.end_time) { - notice.end_time = $filter('date')(notice.end_time, 'yyyyMMdd') + notice.end_time = $filter('date')(notice.end_time, 'yyyy-MM-dd') } else { if (notice.status == '1') { $scope.notice.status = '0'; diff --git a/src/main/ui/static/config/notice/templates/notice_add.html b/src/main/ui/static/config/notice/templates/notice_add.html index 03fa909a9..469c281cb 100644 --- a/src/main/ui/static/config/notice/templates/notice_add.html +++ b/src/main/ui/static/config/notice/templates/notice_add.html @@ -127,6 +127,7 @@
+