fix

netflix-dao/src/main/java/com/cyksj/model/views/FormFieldsDataView.java

@@ -15,7 +15,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "form_fields_data fa")
+@SearchBean(tables = "form_fields_data fa",
+		where = "fa.deleted is true")
 public class FormFieldsDataView {
 	@DbField("fa.id")
 	private Integer id;

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

@@ -128,7 +128,7 @@ public class FormServiceImpl implements FormService {
 
 	private List<List<String>> data(Long promotionId) {
 		List<List<String>> contentList = Lists.newArrayList();
-		List<FormFieldsData> fieldsDataList = formFieldsDataMapper.selectList(new LambdaQueryWrapper<FormFieldsData>().eq(FormFieldsData::getPromotionId, promotionId).orderByAsc(FormFieldsData::getSorted));
+		List<FormFieldsData> fieldsDataList = formFieldsDataMapper.selectList(new LambdaQueryWrapper<FormFieldsData>().eq(FormFieldsData::getPromotionId, promotionId).eq(FormFieldsData::getDeleted, true).orderByAsc(FormFieldsData::getSorted));
 		fieldsDataList.forEach((formFieldsData) -> {
 			ArrayList<String> dataList = new ArrayList<>();
 			dataList.add(formFieldsData.getContent());

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

@@ -106,7 +106,9 @@ public class FormController {
 	 */
 	@GetMapping("/template/get")
 	public Result<SearchResult<FormTemplate>> getTemplate() {
-		SearchResult<FormTemplate> search = beanSearcher.search(FormTemplate.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		SearchResult<FormTemplate> search = beanSearcher.search(FormTemplate.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(FormTemplate::getDeleted, true)
+				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
 
@@ -115,7 +117,9 @@ public class FormController {
 	 */
 	@GetMapping("/template/fields/get")
 	public Result<SearchResult<FormFields>> getTemplateFields() {
-		SearchResult<FormFields> search = beanSearcher.search(FormFields.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		SearchResult<FormFields> search = beanSearcher.search(FormFields.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(FormFields::getDeleted, true)
+				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}
 
@@ -142,7 +146,8 @@ public class FormController {
 	@GetMapping("/get/question/resp/data")
 	public Result<SearchResult<FormFieldsDataView>> getData(Long fieldsId) {
 		if (fieldsId == null) fieldsId = 3l;
-		SearchResult<FormFieldsDataView> search = beanSearcher.search(FormFieldsDataView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		SearchResult<FormFieldsDataView> search = beanSearcher.search(FormFieldsDataView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}