Merge remote-tracking branch 'origin/master'

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

@@ -118,7 +118,9 @@ public class LabourApiController {
                     labourServices.setApprovePersonName(curUser.getRealName());
                 }
 
-                Company company = companyService.get(user.getCompanyId());
+
+                User user1 = userService.get(labourServices.getCreateBy());
+                Company company = companyService.get(user1.getCompanyId());
 
                 if(company!=null) {
                     labourServices.setCompanyName(company.getName());

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 = "消息分类")
@@ -184,12 +190,6 @@ public class MessageNoticeApiController {
         MessageResult<Map> messageResult = new MessageResult<>();
 
         try {
-            JobUser jobUser = jobUserService.get(subject);
-
-            if (jobUser == null) {
-                throw new Exception("未登录!");
-            }
-
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("a.create_time","asc"));
 
@@ -236,12 +236,6 @@ public class MessageNoticeApiController {
         MessageResult<Map> messageResult = new MessageResult<>();
 
         try {
-            JobUser jobUser = jobUserService.get(subject);
-
-            if (jobUser == null) {
-                throw new Exception("未登录!");
-            }
-
             MessageNotice mc = messageNoticeService.get(messageId);
             if(mc == null){
                 throw new Exception("查询错误!");
@@ -250,6 +244,14 @@ public class MessageNoticeApiController {
             User createUser = userService.get(mc.getCreateBy());
             mc.setCreateByN(createUser.getRealName());
 
+            Company company = companyService.get(createUser.getCompanyId());
+            if(company != null){
+                String scaleName = dataDictionaryService.getName(company.getScale());
+                company.setScaleName(scaleName);
+                String industryN = dataDictionaryService.getName(company.getIndustry());
+                company.setIndustryName(industryN);
+            }
+
             MessageRead messageRead = messageReadService.findByMIdAndUserId(mc.getId(),subject);
             Boolean isNeedAgree = false;
             Boolean isAgree = false;
@@ -280,7 +282,7 @@ public class MessageNoticeApiController {
             returnMap.put("messageDetail",mc);
             returnMap.put("isNeedAgree",isNeedAgree);
             returnMap.put("isAgree",isAgree);
-
+            returnMap.put("company",company);
             messageResult.setData(returnMap);
             messageResult.setResult(true);
             messageResult.setCode(200);

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

@@ -638,6 +638,12 @@ public class ResumeApiController {
 //                    ree.setDelFlag(false);
 //                    ree.setResumeId(resumeId);
 //                    ree.setSchoolName(expDTO.getName());
+
+
+
+
+
+
 //                    ree.setMajor(expDTO.getContent());
 //                    ree.setEducation(expDTO.getRemark());
 //                    ree.setStartTime(expDTO.getTimeS());