瀏覽代碼

fix bug:categoryName: null 导致的空指针异常

simonlll 4 月之前
父節點
當前提交
0df9325761

+ 11 - 11
airport-admin/src/main/java/com/sundot/airport/web/controller/item/FailedMatchItemController.java

@@ -125,39 +125,39 @@ public class FailedMatchItemController extends BaseController {
125
         failedMatchItem.setId(id);
125
         failedMatchItem.setId(id);
126
 
126
 
127
         // 设置基本字段
127
         // 设置基本字段
128
-        if (params.containsKey("name")) {
128
+        if (params.containsKey("name") && params.get("name") != null) {
129
             failedMatchItem.setName(params.get("name").toString());
129
             failedMatchItem.setName(params.get("name").toString());
130
         }
130
         }
131
-        if (params.containsKey("categoryCode")) {
131
+        if (params.containsKey("categoryCode") && params.get("categoryCode") != null) {
132
             failedMatchItem.setCategoryCode(params.get("categoryCode").toString());
132
             failedMatchItem.setCategoryCode(params.get("categoryCode").toString());
133
         }
133
         }
134
-        if (params.containsKey("categoryName")) {
134
+        if (params.containsKey("categoryName") && params.get("categoryName") != null) {
135
             failedMatchItem.setCategoryName(params.get("categoryName").toString());
135
             failedMatchItem.setCategoryName(params.get("categoryName").toString());
136
         }
136
         }
137
-        if (params.containsKey("extractedQuantity")) {
137
+        if (params.containsKey("extractedQuantity") && params.get("extractedQuantity") != null) {
138
             failedMatchItem.setExtractedQuantity(params.get("extractedQuantity").toString());
138
             failedMatchItem.setExtractedQuantity(params.get("extractedQuantity").toString());
139
         }
139
         }
140
-        if (params.containsKey("extractedLocation")) {
140
+        if (params.containsKey("extractedLocation") && params.get("extractedLocation") != null) {
141
             failedMatchItem.setExtractedLocation(params.get("extractedLocation").toString());
141
             failedMatchItem.setExtractedLocation(params.get("extractedLocation").toString());
142
         }
142
         }
143
-        if (params.containsKey("teamId")) {
143
+        if (params.containsKey("teamId") && params.get("teamId") != null) {
144
             failedMatchItem.setTeamId(Long.valueOf(params.get("teamId").toString()));
144
             failedMatchItem.setTeamId(Long.valueOf(params.get("teamId").toString()));
145
         }
145
         }
146
-        if (params.containsKey("teamName")) {
146
+        if (params.containsKey("teamName") && params.get("teamName") != null) {
147
             failedMatchItem.setTeamName(params.get("teamName").toString());
147
             failedMatchItem.setTeamName(params.get("teamName").toString());
148
         }
148
         }
149
-        if (params.containsKey("checkPointId")) {
149
+        if (params.containsKey("checkPointId") && params.get("checkPointId") != null) {
150
             failedMatchItem.setCheckPointId(Integer.valueOf(params.get("checkPointId").toString()));
150
             failedMatchItem.setCheckPointId(Integer.valueOf(params.get("checkPointId").toString()));
151
         }
151
         }
152
-        if (params.containsKey("checkPointName")) {
152
+        if (params.containsKey("checkPointName") && params.get("checkPointName") != null) {
153
             failedMatchItem.setCheckPointName(params.get("checkPointName").toString());
153
             failedMatchItem.setCheckPointName(params.get("checkPointName").toString());
154
         }
154
         }
155
-        if (params.containsKey("isActiveConcealment")) {
155
+        if (params.containsKey("isActiveConcealment") && params.get("isActiveConcealment") != null) {
156
             failedMatchItem.setIsActiveConcealment(Integer.valueOf(params.get("isActiveConcealment").toString()));
156
             failedMatchItem.setIsActiveConcealment(Integer.valueOf(params.get("isActiveConcealment").toString()));
157
         }
157
         }
158
 
158
 
159
         // 处理 postCode:通过 postCode 查询 sys_post 表获取 position_id 和 position_name
159
         // 处理 postCode:通过 postCode 查询 sys_post 表获取 position_id 和 position_name
160
-        if (params.containsKey("postCode")) {
160
+        if (params.containsKey("postCode") && params.get("postCode") != null) {
161
             String postCode = params.get("postCode").toString();
161
             String postCode = params.get("postCode").toString();
162
             SysPost post = new SysPost();
162
             SysPost post = new SysPost();
163
             post.setPostCode(postCode);
163
             post.setPostCode(postCode);