From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 12 十二月 2024 16:51:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java index af2e92e..c5dbbcc 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java @@ -400,12 +400,13 @@ request.setSorts(new ArrayList<>()); RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest(); file.setFieldName("event_type"); - file.setFieldValue("131588");//瀹夐槻鍛婅 + file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀� file.setType("in"); if(type == 1){ + file.setFieldValue("131588");//瀹夐槻鍛婅 + }else if(type == 2){ - }else if(type == 1){ - + file.setFieldValue("131593");//浜哄憳鍛婅 } request.getFiledOptions().add(file); SortRequest sort = new SortRequest(); -- Gitblit v1.9.3