BUG修改

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

@@ -377,9 +377,9 @@ public class MessageNoticeApiController {
         MessageResult<List> messageResult = new MessageResult<>();
         List<Map> resultList = new ArrayList<>();
         try {
-            JobUser jobUser = jobUserService.get(subject);
+            User sysUser = userService.get(subject);
 
-            if (jobUser == null) {
+            if (sysUser == null) {
                 throw new Exception("未登录!");
             }
             //List<DataDictionary> ddList = dataDictionaryService.findByCatalogName("消息分类");
@@ -393,7 +393,7 @@ public class MessageNoticeApiController {
             for(String classify : classifys){
                 if("1".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
-                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(jobUser.getId(),"1");
+                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(sysUser.getId(),"1");
                     mnMap.put("classify","系统消息");
                     mnMap.put("classifyId","1");
                     mnMap.put("newMessage",mn);
@@ -403,7 +403,7 @@ public class MessageNoticeApiController {
                 }else if("2".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
                     //job_resume_deliver_content
-                    ResumeDeliverContent rdc = resumeDeliverContentService.findTopByUserId(jobUser.getId());
+                    ResumeDeliverContent rdc = resumeDeliverContentService.findTopByUserId(sysUser.getId());
 
                     mnMap.put("classify","求职消息");
                     mnMap.put("classifyId","2");
@@ -413,7 +413,7 @@ public class MessageNoticeApiController {
                     resultList.add(mnMap);
                 }else if("3".equals(classify)){
                     Map<String, Object> mnMap = new HashMap<>();
-                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(jobUser.getId(),"3");
+                    MessageNotice mn = messageNoticeService.findTopByUserIdAndClassify(sysUser.getId(),"3");
                     mnMap.put("classify","政策发布");
                     mnMap.put("classifyId","3");
                     mnMap.put("newMessage",mn);

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

@@ -249,6 +249,7 @@ public class ResumeApiController {
             }
             resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             resume.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("简历状态",resume.getStatus()));
+            resume.setDreamAddName(dataDictionaryService.findNameByCatalogNameAndValue("期望工作地",resume.getDreamAdd()));
 
 
             //教育经验
@@ -609,10 +610,11 @@ public class ResumeApiController {
             if(workCategory != null) {
                 resume.setPositionCategoryName(workCategory.getName());
             }
-            City city = cityService.get(Integer.parseInt(resume.getDreamAdd()));
-            if(city != null){
-                resume.setDreamAddName(city.getCityName());
-            }
+//            City city = cityService.get(Integer.parseInt(resume.getDreamAdd()));
+//            if(city != null){
+//                resume.setDreamAddName(city.getCityName());
+//            }
+            resume.setDreamAddName(dataDictionaryService.findNameByCatalogNameAndValue("期望工作地",resume.getDreamAdd()));
             //resume.setUserIsAuthenticationName(dataDictionaryService.findNameByCatalogNameAndValue("实名制状态",resume.getUserIsAuthentication()));
             //resume.setStatusName(dataDictionaryService.findNameByCatalogNameAndValue("简历状态",resume.getStatus()));
         }