From 44a0ef1620cad87479390900eb6ded041c7b8d7b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 五月 2024 16:56:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/platform/src/main/java/com/doumee/api/system/SystemDictController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemDictController.java b/server/platform/src/main/java/com/doumee/api/system/SystemDictController.java
index 71a297a..169f85c 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemDictController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemDictController.java
@@ -2,13 +2,16 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictBiz;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemDictDTO;
import com.doumee.dao.system.model.SystemDict;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.vo.SystemDictListVO;
import com.doumee.service.system.SystemDictService;
import io.swagger.annotations.Api;
@@ -20,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author Eva.Caesar Liu
@@ -35,6 +39,9 @@
@Autowired
private SystemDictBiz systemDictBiz;
+
+
+
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -79,4 +86,29 @@
public ApiResponse<PageData<SystemDictListVO>> findPage (@RequestBody PageWrap<QuerySystemDictDTO> pageWrap) {
return ApiResponse.success(systemDictService.findPage(pageWrap));
}
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @ApiOperation("鏌ヨ瀛楀吀鍊�")
+ @PostMapping("/getAgreement")
+ public ApiResponse<List<String>> getAgreement() {
+ List<String> list = new ArrayList<>();
+ SystemDictData use = systemDictDataBiz.queryByCode(Constants.PROTOCOL,Constants.USE);
+ if(Objects.nonNull(use)){
+ list.add(use.getCode());
+ }else{
+ list.add("");
+ }
+ SystemDictData privacy = systemDictDataBiz.queryByCode(Constants.PROTOCOL,Constants.PRIVACY);
+ if(Objects.nonNull(privacy)){
+ list.add(privacy.getCode());
+ }else{
+ list.add("");
+ }
+ return ApiResponse.success(list);
+ }
+
+
}
--
Gitblit v1.9.3