|
@@ -355,12 +355,12 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
if (!Check.isNull(projectJson.getString("advertiserId"))) {
|
|
if (!Check.isNull(projectJson.getString("advertiserId"))) {
|
|
advertiserIdMap.put(projectJson.getString("advertiserId"), projectJson.getString("advertiserId"));
|
|
advertiserIdMap.put(projectJson.getString("advertiserId"), projectJson.getString("advertiserId"));
|
|
}
|
|
}
|
|
- if (!Check.isNull(projectJson.getString("productId"))) {
|
|
|
|
|
|
+ if (!Check.isNull(projectJson.getLong("productId"))) {
|
|
productIdMap.put(projectJson.getLong("productId"), projectJson.getLong("productId"));
|
|
productIdMap.put(projectJson.getLong("productId"), projectJson.getLong("productId"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Map<String, String> userMap = new HashMap<>();
|
|
Map<String, String> userMap = new HashMap<>();
|
|
- if (!Check.isNull(userIdMap)) {
|
|
|
|
|
|
+ if (!Check.isNullMap(userIdMap)) {
|
|
List<JSONObject> userList = userService.getUserMapByMap(userIdMap);
|
|
List<JSONObject> userList = userService.getUserMapByMap(userIdMap);
|
|
if (!Check.isNull(userList)) {
|
|
if (!Check.isNull(userList)) {
|
|
for (int i = 0; i < userList.size(); i++) {
|
|
for (int i = 0; i < userList.size(); i++) {
|
|
@@ -370,7 +370,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Map<String, String> advertiserMap = new HashMap<>();
|
|
Map<String, String> advertiserMap = new HashMap<>();
|
|
- if (!Check.isNull(advertiserIdMap)) {
|
|
|
|
|
|
+ if (!Check.isNullMap(advertiserIdMap)) {
|
|
List<JSONObject> advertiserList = advertiserService.getAdvertiserByMap(advertiserIdMap);
|
|
List<JSONObject> advertiserList = advertiserService.getAdvertiserByMap(advertiserIdMap);
|
|
if (!Check.isNull(advertiserList)) {
|
|
if (!Check.isNull(advertiserList)) {
|
|
for (int i = 0; i < advertiserList.size(); i++) {
|
|
for (int i = 0; i < advertiserList.size(); i++) {
|
|
@@ -380,7 +380,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Map<Long, String> productMap = new HashMap<>();
|
|
Map<Long, String> productMap = new HashMap<>();
|
|
- if (!Check.isNull(productIdMap)) {
|
|
|
|
|
|
+ if (!Check.isNullMap(productIdMap)) {
|
|
List<JSONObject> productList = productService.getProductByMap(productIdMap);
|
|
List<JSONObject> productList = productService.getProductByMap(productIdMap);
|
|
if (!Check.isNull(productList)) {
|
|
if (!Check.isNull(productList)) {
|
|
for (int i = 0; i < productList.size(); i++) {
|
|
for (int i = 0; i < productList.size(); i++) {
|
|
@@ -399,18 +399,18 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
|
|
member.setMaxBid(projectJson.getLong("maxBid"));
|
|
member.setMaxBid(projectJson.getLong("maxBid"));
|
|
String advertiserId = projectJson.getString("advertiserId");
|
|
String advertiserId = projectJson.getString("advertiserId");
|
|
member.setAdvertiserId(advertiserId);
|
|
member.setAdvertiserId(advertiserId);
|
|
- if (!Check.isNull(advertiserMap)) {
|
|
|
|
|
|
+ if (!Check.isNullMap(advertiserMap)) {
|
|
member.setAdvertiserName(advertiserMap.get(advertiserId));
|
|
member.setAdvertiserName(advertiserMap.get(advertiserId));
|
|
}
|
|
}
|
|
String responsibleId = projectJson.getString("responsibleId");
|
|
String responsibleId = projectJson.getString("responsibleId");
|
|
String designResponsibleId = projectJson.getString("designResponsibleId");
|
|
String designResponsibleId = projectJson.getString("designResponsibleId");
|
|
- if (!Check.isNull(userMap)) {
|
|
|
|
|
|
+ if (!Check.isNullMap(userMap)) {
|
|
member.setResponsibleName(userMap.get(responsibleId));
|
|
member.setResponsibleName(userMap.get(responsibleId));
|
|
member.setDesignResponsibleName(userMap.get(designResponsibleId));
|
|
member.setDesignResponsibleName(userMap.get(designResponsibleId));
|
|
}
|
|
}
|
|
Long productId = projectJson.getLong("productId");
|
|
Long productId = projectJson.getLong("productId");
|
|
member.setProductId(productId);
|
|
member.setProductId(productId);
|
|
- if (!Check.isNull(productMap)) {
|
|
|
|
|
|
+ if (!Check.isNullMap(productMap)) {
|
|
member.setProductName(productMap.get(productId));
|
|
member.setProductName(productMap.get(productId));
|
|
}
|
|
}
|
|
}
|
|
}
|