--no commit message

com.zrqx.system/src/main/java/com/zrqx/system/bg/controller/question/DesignQuestionController.java

@@ -3,6 +3,7 @@ package com.zrqx.system.bg.controller.question;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -220,6 +221,7 @@ public class DesignQuestionController {
 			CallBack<UserVO> list = sysuserClient.getUser(userForm);
 			if (list.isStatus()) {
 				if (list.getData() != null) {
+					if(StringUtils.isNotBlank(list.getData().getArea_adminId())) {
 					Notice noti = new Notice();
 					if (form.getStatus().equals(QuestionStatuEnum.YES_ADOPT.getCode())) {
 						noti.setContent("恭喜您组员提交的问卷调研申请已经通过审核,快去看看");
@@ -230,13 +232,14 @@ public class DesignQuestionController {
 					noti.setType(4);
 					noti.setStatus(0);
 					noti.setUserid(list.getData().getUserId());
-					noti.setUserName(examination.getUserName());
+					noti.setUserName(list.getData().getUserName());
 					noti.setCreateTime(new Date());
 					noti.setResId(form.getId());
 					noti.setTitle(examination.getTitle());
 					sysuserClient.save(noti);
 					}
 				}
+			}
 			examinationService.updateByPrimaryKeySelective(examination);
 		}
 		return CallBack.success(true);