增加判断

src/main/java/com/unissoft/ventilation/service/impl/ProcessBasisServiceImpl.java

@@ -163,14 +163,25 @@ public class ProcessBasisServiceImpl extends ServiceImpl<ProcessBasisMapper, Pro
 			ew1.eq("depot_id", depotId);
 		}
 		List<ProcessBasisSon> sonList = processBasisSonMapper.selectList(ew1);
-		for (ProcessBasis processBasis : list) {
-			for (ProcessBasisSon processBasisSon : sonList) {
-				if(processBasis.getId().equals(processBasisSon.getZid())){
-					processBasis.setContent(processBasisSon.getContent());
-					processBasis.setDepotId(processBasisSon.getDepotId());
+		if(list.size()>0 && sonList.size()>0){
+			/*for (ProcessBasis processBasis : list) {
+				for (ProcessBasisSon processBasisSon : sonList) {
+					if(processBasis.getId().equals(processBasisSon.getZid())){
+						processBasis.setContent(processBasisSon.getContent());
+						processBasis.setDepotId(processBasisSon.getDepotId());
+					}
+				}
+			}*/
+			for (int i = 0; i < list.size();i++) {
+				for (int j = 0; j < sonList.size();j++){
+					if(list.get(i).getId().equals(sonList.get(j).getZid())){
+						list.get(i).setContent(sonList.get(j).getZid());
+						list.get(i).setDepotId(sonList.get(j).getDepotId());
+					}
 				}
 			}
 		}
+		
 		return list;
 	}