BUG修改

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageNoticeApiController.java

@@ -2,11 +2,14 @@ package com.jpsoft.employment.modules.mobile.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.domain.CompanyInfo;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.config.OSSConfig;
+import com.jpsoft.employment.modules.base.entity.Company;
 import com.jpsoft.employment.modules.base.entity.MessageNotice;
 import com.jpsoft.employment.modules.base.entity.MessageRead;
 import com.jpsoft.employment.modules.base.entity.UserAuthenticationApprove;
+import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.base.service.MessageNoticeService;
 import com.jpsoft.employment.modules.base.service.MessageReadService;
 import com.jpsoft.employment.modules.base.service.UserAuthenticationApproveService;
@@ -94,6 +97,9 @@ public class MessageNoticeApiController {
     @Autowired
     private ResumeDeliverRecordService resumeDeliverRecordService;
 
+    @Autowired
+    private CompanyService companyService;
+
 
     @PostMapping("messageClassify")
     @ApiOperation(value = "消息分类")
@@ -238,6 +244,12 @@ public class MessageNoticeApiController {
             User createUser = userService.get(mc.getCreateBy());
             mc.setCreateByN(createUser.getRealName());
 
+            Company company = companyService.get(createUser.getCompanyId());
+            String companyName = "";
+            if(company != null){
+                companyName = company.getName();
+            }
+
             MessageRead messageRead = messageReadService.findByMIdAndUserId(mc.getId(),subject);
             Boolean isNeedAgree = false;
             Boolean isAgree = false;
@@ -268,7 +280,7 @@ public class MessageNoticeApiController {
             returnMap.put("messageDetail",mc);
             returnMap.put("isNeedAgree",isNeedAgree);
             returnMap.put("isAgree",isAgree);
-
+            returnMap.put("companyName",companyName);
             messageResult.setData(returnMap);
             messageResult.setResult(true);
             messageResult.setCode(200);