Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/employment/modules/job/controller/RecruitmentController.java

@@ -178,9 +178,18 @@ public class RecruitmentController {
                     List<String> tagList = new ArrayList<>();
 
                     JSONObject jsonObject = JSONObject.fromObject(welfare);
-                    if(jsonObject!=null){
-                        String checkboxGroup1 = jsonObject.get("checkboxGroup1").toString();
-                        String dynamicTags = jsonObject.get("dynamicTags").toString();
+                    if(jsonObject!=null&&jsonObject.size()>0){
+
+                        String checkboxGroup1="";
+                        String dynamicTags="";
+
+                        if(jsonObject.get("checkboxGroup1")!=null){
+                            checkboxGroup1 = jsonObject.get("checkboxGroup1").toString();
+                        }
+
+                        if(jsonObject.get("dynamicTags")!=null){
+                            dynamicTags = jsonObject.get("dynamicTags").toString();
+                        }
 
                         if(StringUtils.isNotEmpty(checkboxGroup1)){
                             recruitment.setCheckboxGroup1(checkboxGroup1);