|
@@ -245,10 +245,6 @@ public class MessageNoticeApiController {
|
|
mc.setCreateByN(createUser.getRealName());
|
|
mc.setCreateByN(createUser.getRealName());
|
|
|
|
|
|
Company company = companyService.get(createUser.getCompanyId());
|
|
Company company = companyService.get(createUser.getCompanyId());
|
|
- String companyName = "";
|
|
|
|
- if(company != null){
|
|
|
|
- companyName = company.getName();
|
|
|
|
- }
|
|
|
|
|
|
|
|
MessageRead messageRead = messageReadService.findByMIdAndUserId(mc.getId(),subject);
|
|
MessageRead messageRead = messageReadService.findByMIdAndUserId(mc.getId(),subject);
|
|
Boolean isNeedAgree = false;
|
|
Boolean isNeedAgree = false;
|
|
@@ -280,7 +276,7 @@ public class MessageNoticeApiController {
|
|
returnMap.put("messageDetail",mc);
|
|
returnMap.put("messageDetail",mc);
|
|
returnMap.put("isNeedAgree",isNeedAgree);
|
|
returnMap.put("isNeedAgree",isNeedAgree);
|
|
returnMap.put("isAgree",isAgree);
|
|
returnMap.put("isAgree",isAgree);
|
|
- returnMap.put("companyName",companyName);
|
|
|
|
|
|
+ returnMap.put("company",company);
|
|
messageResult.setData(returnMap);
|
|
messageResult.setData(returnMap);
|
|
messageResult.setResult(true);
|
|
messageResult.setResult(true);
|
|
messageResult.setCode(200);
|
|
messageResult.setCode(200);
|