MVP1.6.2-工资原表识别-优化

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java

@@ -365,40 +365,64 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
 				}*/
 				else if ("出差事由".equals(((JSONObject) title.get(0)).get("text"))) {
 					value = (JSONObject) content.get(VALUESTR);
-					reason = value.getString("text");
+					if (Common.isNotNull(value)) {
+						reason = value.getString("text");
+					}
 				} else if ("随行人员".equals(((JSONObject) title.get(0)).get("text"))) {
 					value = (JSONObject) content.get(VALUESTR);
-					person = value.getString("text");
+					if (Common.isNotNull(value)) {
+						person = value.getString("text");
+					}
 				} else if ("出差地点".equals(((JSONObject) title.get(0)).get("text"))) {
 					value = (JSONObject) content.get(VALUESTR);
-					address = value.getString("text");
+					if (Common.isNotNull(value)) {
+						address = value.getString("text");
+					}
 				} else if ("出差地点级别".equals(((JSONObject) title.get(0)).get("text"))) {
 					value = (JSONObject) content.get(VALUESTR);
-					selector = (JSONObject) value.get("selector");
-					options = (JSONArray) selector.get("options");
-					options0 = (JSONObject) options.get(0);
-					options0value = (JSONArray) options0.get(VALUESTR);
-					options0value0 = (JSONObject) options0value.get(0);
-					addressLevel = options0value0.getString("text");
+					if (Common.isNotNull(value)) {
+						selector = (JSONObject) value.get("selector");
+						if (Common.isNotNull(selector)) {
+							options = (JSONArray) selector.get("options");
+							if (Common.isNotNull(options)) {
+								options0 = (JSONObject) options.get(0);
+								if (Common.isNotNull(options0)) {
+									options0value = (JSONArray) options0.get(VALUESTR);
+									if (Common.isNotNull(options0value)) {
+										options0value0 = (JSONObject) options0value.get(0);
+										if (Common.isNotNull(options0value0)) {
+											addressLevel = options0value0.getString("text");
+										}
+									}
+								}
+							}
+						}
+					}
 				} else if (((JSONObject) title.get(0)).getString("text").contains("交通补助")) {
 					value = (JSONObject) content.get(VALUESTR);
-					if (Common.isNotNull(value.getString("text"))) {
+					if (value != null && Common.isNotNull(value.getString("text"))) {
 						jiaoTong = value.getString("text");
 					}
 				} else if (((JSONObject) title.get(0)).getString("text").contains("餐饮补助")) {
 					value = (JSONObject) content.get(VALUESTR);
-					if (Common.isNotNull(value.getString("text"))) {
+					if (value != null && Common.isNotNull(value.getString("text"))) {
 						canYin = value.getString("text");
 					}
 				} else if ("出行工具".equals(((JSONObject) title.get(0)).get("text"))) {
 					value = (JSONObject) content.get(VALUESTR);
-					selector = (JSONObject) value.get("selector");
-					options = (JSONArray) selector.get("options");
-					for (int j=0;j<options.size();j++) {
-						options0 = (JSONObject) options.get(j);
-						options0value = (JSONArray) options0.get(VALUESTR);
-						options0value0 = (JSONObject) options0value.get(0);
-						tools += options0value0.getString("text") + ";";
+					if (Common.isNotNull(value)) {
+						selector = (JSONObject) value.get("selector");
+						if (Common.isNotNull(selector)) {
+							options = (JSONArray) selector.get("options");
+							if (Common.isNotNull(options)) {
+								for (int j = 0; j < options.size(); j++) {
+									options0 = (JSONObject) options.get(j);
+									options0value = (JSONArray) options0.get(VALUESTR);
+									options0value0 = (JSONObject) options0value.get(0);
+									tools += options0value0.getString("text") + ";";
+								}
+							}
+						}
 					}
 				}
 			}