|
@@ -262,18 +262,20 @@ public class NoticeManagementController {
|
|
|
List<EvaluationNotice> list = new ArrayList<>();
|
|
|
for (EvaluationNotice evaluationNotice : evaluationNoticeList) {
|
|
|
if ("所有单位".equals(evaluationNotice.getSendTo())) {
|
|
|
- if (evaluationNotice.getNoticeAnnex().length() > 0){
|
|
|
- String[] noticeAnnexList = evaluationNotice.getNoticeAnnex().split(",");
|
|
|
- StringBuilder noticeAnnex = new StringBuilder();
|
|
|
- for (String str : noticeAnnexList) {
|
|
|
- if (str.contains("All")) {
|
|
|
- noticeAnnex.append(str).append(",");
|
|
|
- } else if (str.contains(deptId)) {
|
|
|
- noticeAnnex.append(str).append(",");
|
|
|
+ if (null != evaluationNotice.getNoticeAnnex()){
|
|
|
+ if (evaluationNotice.getNoticeAnnex().length() > 0){
|
|
|
+ String[] noticeAnnexList = evaluationNotice.getNoticeAnnex().split(",");
|
|
|
+ StringBuilder noticeAnnex = new StringBuilder();
|
|
|
+ for (String str : noticeAnnexList) {
|
|
|
+ if (str.contains("All")) {
|
|
|
+ noticeAnnex.append(str).append(",");
|
|
|
+ } else if (str.contains(deptId)) {
|
|
|
+ noticeAnnex.append(str).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (noticeAnnex.toString().length() > 0){
|
|
|
+ evaluationNotice.setNoticeAnnex(noticeAnnex.toString().substring(0, noticeAnnex.toString().length() - 1));
|
|
|
}
|
|
|
- }
|
|
|
- if (noticeAnnex.toString().length() > 0){
|
|
|
- evaluationNotice.setNoticeAnnex(noticeAnnex.toString().substring(0, noticeAnnex.toString().length() - 1));
|
|
|
}
|
|
|
}
|
|
|
list.add(evaluationNotice);
|