瀏覽代碼

企业名称转义判断空指针

ZhangWenQiang 6 年之前
父節點
當前提交
9c88da0a60

+ 10 - 2
src/main/java/com/jeeplus/modules/hpuser/service/HpApplyPositionService.java

@@ -692,7 +692,11 @@ public class HpApplyPositionService extends CrudService<HpApplyPositionMapper, H
                                         dpPositionForApplyAPI.setSpecialWelfare(welfare);
                                         dpPositionForApplyAPI.setWelfare(welfare);
                                         HpCompany hpCompany = new HpCompany();
-                                        hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                        if (dpPositionForApplyAPI1.getDpEnterpriseAuthentication() != null) {
+                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName())) {
+                                                hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                            }
+                                        }
                                         dpPositionForApplyAPI.setHpCompany(hpCompany);
                                         dpPositionForApplyAPI.setPositionName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getPositionName()));
                                         hpPositionAddress.setPositionId(Integer.parseInt(dpPositionForApplyAPI1.getId()));
@@ -779,7 +783,11 @@ public class HpApplyPositionService extends CrudService<HpApplyPositionMapper, H
                                         dpPositionForApplyAPI3.setWorkDay(dpPositionForApplyAPI2.getWorkDate());
 
                                         HpCompany hpCompany1 = new HpCompany();
-                                        hpCompany1.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                        if (dpPositionForApplyAPI2.getDpEnterpriseAuthentication() != null) {
+                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName())) {
+                                                hpCompany1.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                            }
+                                        }
                                         dpPositionForApplyAPI3.setHpCompany(hpCompany1);
                                         dpPositionForApplyAPI3.setPositionName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getPositionName()));
                                         hpPositionAddress.setPositionId(Integer.parseInt(dpPositionForApplyAPI2.getId()));

+ 14 - 6
src/main/java/com/jeeplus/modules/hpuser/service/HpFavoritePositionService.java

@@ -91,10 +91,10 @@ public class HpFavoritePositionService extends CrudService<HpFavoritePositionMap
         Map<String, Object> returnMap = new HashMap<String, Object>();
         String userId = requestMap.get("user_id");
         String userToken = requestMap.get("user_token");
-        String memberId =  requestMap.get("member_id");
+        String memberId = requestMap.get("member_id");
         //验证用户是否处于登录态
         if (TokenUtil.validateLogin(memberId, userId)) {
-             //验证用户合法性
+            //验证用户合法性
             if (TokenUtil.validateToken(userId, userToken)) {
                 String positionId = requestMap.get("positionId");
                 String positionCategory = requestMap.get("positionCategory");
@@ -156,7 +156,7 @@ public class HpFavoritePositionService extends CrudService<HpFavoritePositionMap
         String userId = requestMap.get("user_id");
         String userToken = requestMap.get("user_token");
         String pageNo = requestMap.get("pageNo");
-        String memberId =  requestMap.get("member_id");
+        String memberId = requestMap.get("member_id");
         //验证用户是否处于登录态
         if (TokenUtil.validateLogin(memberId, userId)) {
             //验证用户合法性
@@ -278,7 +278,11 @@ public class HpFavoritePositionService extends CrudService<HpFavoritePositionMap
 
                                         dpPositionForApplyAPI.setBasicSalary(basicSalary);
                                         HpCompany hpCompany = new HpCompany();
-                                        hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                        if (dpPositionForApplyAPI.getDpEnterpriseAuthentication() != null) {
+                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI.getDpEnterpriseAuthentication().getEnterpriseName())) {
+                                                hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                            }
+                                        }
                                         dpPositionForApplyAPI.setHpCompany(hpCompany);
                                         dpPositionForApplyAPI.setCreateDate(hpFavoritePosition1.getCreateTime());
 
@@ -329,7 +333,11 @@ public class HpFavoritePositionService extends CrudService<HpFavoritePositionMap
                                         }
 
                                         HpCompany hpCompany1 = new HpCompany();
-                                        hpCompany1.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                        if (dpPositionForApplyAPI1.getDpEnterpriseAuthentication() != null) {
+                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName())) {
+                                                hpCompany1.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                            }
+                                        }
                                         dpPositionForApplyAPI1.setHpCompany(hpCompany1);
                                         dpPositionForApplyAPI1.setCreateDate(hpFavoritePosition1.getCreateTime());
 
@@ -379,6 +387,6 @@ public class HpFavoritePositionService extends CrudService<HpFavoritePositionMap
     }
 
     public void saveMenberIdByuserId(String userid, String hpMemberId) {
-        mapper.saveMenberIdByuserId(userid,hpMemberId);
+        mapper.saveMenberIdByuserId(userid, hpMemberId);
     }
 }

+ 10 - 3
src/main/java/com/jeeplus/modules/hpuser/service/HpInterviewInviteService.java

@@ -471,7 +471,11 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         dpPositionForApplyAPI.setWelfare(welfare);
                                         dpPositionForApplyAPI.setSpecialWelfare(welfare);
                                         HpCompany hpCompany = new HpCompany();
-                                        hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                        if (dpPositionForApplyAPI1.getDpEnterpriseAuthentication() != null) {
+                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName())) {
+                                                hpCompany.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                            }
+                                        }
                                         dpPositionForApplyAPI.setHpCompany(hpCompany);
 
                                         dpPositionForApplyAPI.setPositionName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI1.getPositionName()));
@@ -554,10 +558,13 @@ public class HpInterviewInviteService extends CrudService<HpInterviewInviteMappe
                                         dpPositionForApplyAPI3.setSpecialWelfare(welfare1);
                                         dpPositionForApplyAPI3.setWelfare(welfare1);
                                         HpCompany hpCompany1 = new HpCompany();
-                                        hpCompany1.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                        if (dpPositionForApplyAPI2.getDpEnterpriseAuthentication() != null) {
+                                            if (StringUtils.isNotBlank(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName())) {
+                                                hpCompany1.setCompanyName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getDpEnterpriseAuthentication().getEnterpriseName()));
+                                            }
+                                        }
                                         dpPositionForApplyAPI3.setHpCompany(hpCompany1);
 
-
                                         dpPositionForApplyAPI3.setPositionName(StringEscapeUtils.unescapeHtml4(dpPositionForApplyAPI2.getPositionName()));
                                         hpPositionAddress.setPositionId(Integer.parseInt(dpPositionForApplyAPI2.getId()));
                                         hpPositionAddress.setPositionCategory(dpPositionForApplyAPI2.getPositionCategory());