fix

netflix-dao/src/main/java/com/cyksj/model/dto/FormFieldsView.java

@@ -13,7 +13,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@SearchBean(tables = "form_fields_default fd left join form_fields ff on ff.id = fd.fields_id" +
+@SearchBean(tables = "form_fields_default fd left join form_fields ff on ff.id = fd.fields_id :promotion_id:" +
 		" left join form_template ft on ft.id = ff.template_id",
 		where = "ff.deleted is true and ft.deleted is true")
 public class FormFieldsView {

netflix-service/src/main/java/com/cyksj/service/mange/form/QuestionnairePromotionService.java

@@ -10,5 +10,5 @@ import com.cyksj.model.entity.QuestionnairePromotion;
  *创建时间:2023/6/14 11:42
  */
 public interface QuestionnairePromotionService extends IService<QuestionnairePromotion> {
-	void saveOrUpdatePromotion(QuestionnairePromotion promotion);
+	Long saveOrUpdatePromotion(QuestionnairePromotion promotion);
 }

netflix-service/src/main/java/com/cyksj/service/mange/form/impl/QuestionnairePromotionServiceImpl.java

@@ -21,11 +21,12 @@ public class QuestionnairePromotionServiceImpl extends ServiceImpl<Questionnaire
 	private final QuestionnairePromotionMapper promotionMapper;
 
 	@Override
-	public void saveOrUpdatePromotion(QuestionnairePromotion promotion) {
+	public Long saveOrUpdatePromotion(QuestionnairePromotion promotion) {
 		if (promotion.getId() == null) {
 			promotionMapper.insert(promotion);
-			return;
+			return promotion.getId();
 		}
 		promotionMapper.updateById(promotion);
+		return promotion.getId();
 	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/form/QuestionnairePromotionController.java

@@ -32,9 +32,9 @@ public class QuestionnairePromotionController {
 	private final HttpServletRequest request;
 
 	@PostMapping("/post")
-	public Result<String> saveQuestionnaire(@RequestBody @Validated QuestionnairePromotion promotion) {
-		promotionService.saveOrUpdatePromotion(promotion);
-		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	public Result<Long> saveQuestionnaire(@RequestBody @Validated QuestionnairePromotion promotion) {
+		Long promotionId = promotionService.saveOrUpdatePromotion(promotion);
+		return GatewayResponse.SUCCESS.newBuilder().toResult(promotionId);
 	}
 
 	@PutMapping("/put")
@@ -65,7 +65,7 @@ public class QuestionnairePromotionController {
 	@GetMapping("/template/get/detail/{promotionId}")
 	public Result<SearchResult<FormFieldsView>> getFieldsView(@PathVariable Long promotionId) {
 		SearchResult<FormFieldsView> search = beanSearcher.search(FormFieldsView.class, MapUtils.flatBuilder(request.getParameterMap())
-				.field(FormFieldsView::getPromotionId, promotionId)
+				.put("promotion_id", String.format(" and fd.promotion_id = %s", promotionId))
 				.orderBy(FormFieldsView::getSorted).asc()
 				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);