--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/notice/FgNoticeController.java

@@ -52,7 +52,7 @@ public class FgNoticeController {
 		List<Notice> list = noticeService.selectByExample(example);
 		for (Notice notice : list) {
 			// 问卷数据
-			if (notice.getType() == 4) {
+			if (notice.getExType() != 3) {
 				
 				if(notice.getExType() ==null) {
 				FgAnswerForm form = new FgAnswerForm();
@@ -70,8 +70,9 @@ public class FgNoticeController {
 				SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式
 				SimpleDateFormat format2 = new SimpleDateFormat("yyyy年MM月dd日");
 				String currentTime = df.format(new Date());
-				Date endTime = examDate.getEndTime();
-				if (endTime != null) {
+				
+				if (examDate != null) {
+					Date endTime = examDate.getEndTime();
 					Date date1;
 					try {
 						date1 = df.parse(currentTime);