Skip to content

A
amos-boot-zx-biz
Commit 00d06b98 authored by chenzhao's avatar chenzhao
Browse files
Options

Merge remote-tracking branch 'origin/developer_bw' into developer_bw

parents c06ff132 6b7cbcd8
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfRectificationOrderController.java
View file @ 00d06b98
...@@ -159,7 +159,9 @@ public class HygfRectificationOrderController extends BaseController { ...@@ -159,7 +159,9 @@ public class HygfRectificationOrderController extends BaseController {
List<String> types = new ArrayList<>(); List<String> types = new ArrayList<>();
e.getRectificationIdea().forEach(t -> { e.getRectificationIdea().forEach(t -> {
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t)); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t));
types.add(jsonObject.getString("type")); if(jsonObject.getString("type") != null) {
types.add(jsonObject.getString("type"));
}
}); });
e.setRectificationType(String.join(",", types)); e.setRectificationType(String.join(",", types));
} }
...@@ -240,7 +242,9 @@ public class HygfRectificationOrderController extends BaseController { ...@@ -240,7 +242,9 @@ public class HygfRectificationOrderController extends BaseController {
List<String> types = new ArrayList<>(); List<String> types = new ArrayList<>();
e.getRectificationIdea().forEach(t -> { e.getRectificationIdea().forEach(t -> {
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t)); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t));
types.add(jsonObject.getString("type")); if(jsonObject.getString("type") != null) {
types.add(jsonObject.getString("type"));
}
}); });
e.setRectificationType(String.join(",", types)); e.setRectificationType(String.join(",", types));
} }
...@@ -328,7 +332,9 @@ public class HygfRectificationOrderController extends BaseController { ...@@ -328,7 +332,9 @@ public class HygfRectificationOrderController extends BaseController {
List<String> types = new ArrayList<>(); List<String> types = new ArrayList<>();
e.getRectificationIdea().forEach(t -> { e.getRectificationIdea().forEach(t -> {
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t)); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t));
types.add(jsonObject.getString("type")); if(jsonObject.getString("type") != null) {
types.add(jsonObject.getString("type"));
}
}); });
e.setRectificationType(String.join(",", types)); e.setRectificationType(String.join(",", types));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment