parentid 判断

assistMg/src/main/java/com/hotent/surveyinfo/controller/CostVerifyTemplateItemsController.java

@@ -113,13 +113,20 @@ public class CostVerifyTemplateItemsController extends BaseController<CostVerify
 			List<CostVerifyTemplateItems> group = entry.getValue();
 			if (group.isEmpty()) continue;
 
+			CostVerifyTemplateItems mainItem = new CostVerifyTemplateItems();
+
 			// 主项（可以取第一个）
-		//	CostVerifyTemplateItems mainItem = group.get(0);
-			CostVerifyTemplateItems mainItem = group.stream()
+
+			 mainItem = group.stream()
 					.filter(item -> item.getParentid() != null )
 					.findFirst()
 					.orElse(null);
 
+			if(mainItem == null){
+				 mainItem = group.get(0);
+			}
+
+
 			String headersIds = "";
 			String itemIds="";
 			// 构造 key-value 映射

assistMg/src/main/resources/mapper/CostVerifyTemplateItemsMapper.xml

@@ -96,10 +96,14 @@ version_id, rkey, rvalue, json_str, cell_code, calculation_formula, unit, create
 		<if test="surveyTemplateId != null">
 			cvti.survey_template_id = #{surveyTemplateId}
 		</if>
-		<if test="taskId != null">
+		<if test="taskId != null and surveyTemplateId == null ">
 			 cvt.task_id = #{taskId}
 		</if>
 
+		<if test="taskId != null and surveyTemplateId !=null ">
+			and cvt.task_id = #{taskId}
+		</if>
+
 		ORDER BY order_num ASC
 	</select>
 	<select id="selectBySurveyTemplateIdAndVersion" resultType="com.hotent.surveyinfo.model.CostVerifyTemplateItems">