|
@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -377,6 +378,9 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
|
|
|
//遍历传入的树
|
|
|
for (ProjectTreesDTO projectTreesDTO : trees) {
|
|
|
List<Integer> valueIds = projectTreesDTO.getValueIds();
|
|
|
+ if(valueIds==null||valueIds.size()==0){
|
|
|
+ valueIds = Arrays.asList(0);
|
|
|
+ }
|
|
|
//遍历值id集合
|
|
|
for (Integer valueId : valueIds) {
|
|
|
AssoProjectTreeNode assoProjectTreeNode = new AssoProjectTreeNode();
|
|
@@ -547,6 +551,9 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
|
|
|
//遍历传入的树
|
|
|
for (ProjectTreesDTO projectTreesDTO : trees) {
|
|
|
List<Integer> valueIds = projectTreesDTO.getValueIds();
|
|
|
+ if(valueIds==null||valueIds.size()==0){
|
|
|
+ valueIds = Arrays.asList(0);
|
|
|
+ }
|
|
|
//遍历值id集合
|
|
|
for (Integer valueId : valueIds) {
|
|
|
AssoProjectTreeNode assoProjectTreeNode = new AssoProjectTreeNode();
|
|
@@ -845,10 +852,12 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
|
|
|
AssoProjectTreeNode assoProjectTreeNode = assoProjectTreeNodes.stream().filter(item -> item.getProjectId().equals(patentProjectVO.getId()) && (item.getTreeType().equals(2) || item.getTreeType().equals(3))).
|
|
|
findFirst().orElse(null);
|
|
|
if (assoProjectTreeNode != null) {
|
|
|
+ ProductOrCategoryVO productOrCategoryVO = new ProductOrCategoryVO();
|
|
|
+ productOrCategoryVO.setValueIds(Arrays.asList(assoProjectTreeNode.getValueId()));
|
|
|
if (assoProjectTreeNode.getTreeType().equals(2)) {
|
|
|
Product product = products.stream().filter(item -> item.getId().equals(assoProjectTreeNode.getFieldId())).findFirst().orElse(null);
|
|
|
if (product != null) {
|
|
|
- ProductOrCategoryVO productOrCategoryVO = new ProductOrCategoryVO();
|
|
|
+
|
|
|
productOrCategoryVO.setName(product.getName());
|
|
|
productOrCategoryVO.setId(product.getId());
|
|
|
productOrCategoryVO.setType(2);
|
|
@@ -857,7 +866,6 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
|
|
|
} else if (assoProjectTreeNode.getTreeType().equals(3)) {
|
|
|
ProductCategory productCategory = productCategories.stream().filter(item -> item.getId().equals(assoProjectTreeNode.getFieldId())).findFirst().orElse(null);
|
|
|
if (productCategory != null) {
|
|
|
- ProductOrCategoryVO productOrCategoryVO = new ProductOrCategoryVO();
|
|
|
productOrCategoryVO.setName(productCategory.getName());
|
|
|
productOrCategoryVO.setId(productCategory.getId());
|
|
|
productOrCategoryVO.setType(3);
|
|
@@ -876,7 +884,7 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
|
|
|
String rootSql ="(p.create_id ="+id+" or p.head_id="+id+" or p.id in (select project_id from asso_project_person where person_id ="+id+"))";
|
|
|
if(sqls.get(0)!=null&&!sqls.get(0).equals(""))
|
|
|
{
|
|
|
- sqls.set(0,rootSql+" and"+"("+sqls.get(0)+")");
|
|
|
+ sqls.set(0,"("+rootSql+") and"+"("+sqls.get(0)+")");
|
|
|
|
|
|
}
|
|
|
else {
|