Merge remote-tracking branch 'origin/test' into test

2 years ago · 416eea5b85
parent 1d3987b5c7 a1460528ec
commit 416eea5b85
1 changed files with 5 additions and 1 deletions
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
@ -108,6 +108,10 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
 			if(SearchConfigEnum.THREEWEEKdd.getId().equals(searchfield)){
 				vo.setIzYeardddd(ocrUsersearchchild.getSearchvalue());
 			}
+
+			if(SearchConfigEnum.PLANSEARCH.getId().equals(searchfield)){
+				vo.setIzplan(ocrUsersearchchild.getSearchvalue());
+			}
 		}
 		return vo;
 	}