|
@@ -199,7 +199,10 @@ public class ProjectMemberController {
|
|
|
for (JSONObject object : list) {
|
|
|
List<JSONObject> proList = new ArrayList<>();
|
|
|
for (JSONObject have : haveList) {
|
|
|
- if (object.getLong("productId") == have.getLong("productId")) {
|
|
|
+ if (Check.isNull(have.getLong("productId"))) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (object.getLong("productId") - have.getLong("productId") == 0) {
|
|
|
proList.add(have);
|
|
|
}
|
|
|
}
|
|
@@ -250,7 +253,10 @@ public class ProjectMemberController {
|
|
|
for (JSONObject object : list) {
|
|
|
List<JSONObject> proList = new ArrayList<>();
|
|
|
for (JSONObject have : projectList) {
|
|
|
- if (object.getLong("productId") == have.getLong("productId")) {
|
|
|
+ if (Check.isNull(have.getLong("productId"))) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (object.getLong("productId") - have.getLong("productId") == 0) {
|
|
|
proList.add(have);
|
|
|
}
|
|
|
}
|