|
@@ -206,7 +206,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
|
|
|
model.setReceiverEnuu(user.getEnuu());
|
|
|
model.setReceiverUu(user.getUseruu());
|
|
|
model.setSenderEnuu(item.getInquiry().getEnUU());
|
|
|
- model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
|
|
|
+ if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
|
|
|
+ model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
|
|
|
+ } else {
|
|
|
+ User admin = userDao.findOne(item.getInquiry().getEnUU());
|
|
|
+ model.setSenderUu(null != admin ? admin.getUserUU() : 0L);
|
|
|
+ }
|
|
|
model.setSmsType(SMS_TYPE);
|
|
|
model.setMailTemplate(MAIL_TEMP_ID);
|
|
|
model.setSmTemplate(SMS_TEMP_ID);
|