From 15cb14e5d1fe955df8d1b73c2c6c8ca768a64441 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 24 九月 2025 17:48:54 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/administration/controller/AnnouncementController.java |  273 ++++--------------------------------------------------
 1 files changed, 22 insertions(+), 251 deletions(-)

diff --git a/src/main/java/com/product/administration/controller/AnnouncementController.java b/src/main/java/com/product/administration/controller/AnnouncementController.java
index f2bf66a..cb4cea3 100644
--- a/src/main/java/com/product/administration/controller/AnnouncementController.java
+++ b/src/main/java/com/product/administration/controller/AnnouncementController.java
@@ -10,13 +10,14 @@
 import com.product.administration.config.CmnConst;
 import com.product.administration.config.SystemCode;
 import com.product.administration.service.AnnouncementService;
-import com.product.core.config.CoreConst;
+import com.product.administration.service.ide.IAnnouncementService;
+import com.product.common.lang.StringUtils;
 import com.product.core.controller.support.AbstractBaseController;
 import com.product.core.entity.FieldSetEntity;
-import com.product.core.entity.RequestParameterEntity;
 import com.product.core.exception.BaseException;
 import com.product.core.spring.context.SpringMVCContextHolder;
 import com.product.module.sys.version.ApiVersion;
+import com.product.util.BaseUtil;
 import com.product.util.ResultInfo;
 
 @RestController
@@ -35,26 +36,7 @@
 	@ApiVersion(1)
 	public String announcementList(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
-			
-
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			return OK_List(announcementService.listAnnouncement(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);
@@ -75,26 +57,7 @@
 	@ApiVersion(1)
 	public String announcementListRelease(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
-			
-
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			return OK_List(announcementService.listAnnouncementRelease(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);
@@ -114,24 +77,7 @@
 	@ApiVersion(1)
 	public String announcementListReceive(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			return OK_List(announcementService.listAnnouncementReceive(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);
@@ -151,24 +97,7 @@
 	@ApiVersion(1)
 	public String treeAnnouncementType(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			return ResultInfo.success(announcementService.treeAnnouncementType(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);
@@ -189,26 +118,7 @@
 	@ApiVersion(1)
 	public String announcementRoleList(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
-			
-
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			return OK_List(announcementService.listAnnouncementRelease(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);
@@ -229,26 +139,9 @@
 	@ApiVersion(1)
 	public String readAnnouncementRemind(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			// 鍒ゆ柇uuid鏄惁涓虹┖
-			if (com.alibaba.druid.util.StringUtils.isEmpty(fse.getString("uuid"))) {
+			if (StringUtils.isEmpty(fse.getUUID())) {
 				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_COUNT.getValue(),
 						SystemCode.SYSTEM_FORM_COUNT.getText());
 				return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -269,31 +162,13 @@
 	@ApiVersion(1)
 	public String findAnnouncement(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			// 鍒ゆ柇uuid鏄惁涓虹┖
-			if (com.alibaba.druid.util.StringUtils.isEmpty(fse.getString("uuid"))) {
+			if (StringUtils.isEmpty(fse.getUUID())) {
 				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_COUNT.getValue(),
 						SystemCode.SYSTEM_FORM_COUNT.getText());
 				return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
 			}
-
 			FieldSetEntity findDict = announcementService.findAnnouncement(fse);
 			return OK_List(findDict);
 		} catch (BaseException e) {
@@ -317,25 +192,7 @@
 	@ApiVersion(1)
 	public String addAnnouncement(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
-			
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			String addRole = announcementService.addAnnouncement(fse);
 			return addRole != null ? OK_Add(addRole)
 					: error(SystemCode.ANNOUNCEMENT_ADD.getValue(), SystemCode.ANNOUNCEMENT_ADD.getText());
@@ -360,26 +217,9 @@
 	@ApiVersion(1)
 	public String releaseAnnouncement(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
-			
-			boolean addRole = announcementService.releaseAnnouncement(fse);
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
+			IAnnouncementService service = (IAnnouncementService) getProxyInstance(announcementService);
+			boolean addRole = service.releaseAnnouncement(fse);
 			return addRole ? OK()
 					: error(SystemCode.ANNOUNCEMENT_ADD.getValue(), SystemCode.ANNOUNCEMENT_ADD.getText());
 		} catch (BaseException e) {
@@ -402,25 +242,7 @@
 	@ApiVersion(1)
 	public String remindAnnouncement(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
-			
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			boolean addRole = announcementService.remindAnnouncement(fse);
 			return addRole ? OK()
 					: error(SystemCode.ANNOUNCEMENT_ADD.getValue(), SystemCode.ANNOUNCEMENT_ADD.getText());
@@ -439,26 +261,9 @@
 	@ApiVersion(1)
 	public String updateAnnouncement(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			// 鍒ゆ柇uuid鏄惁涓虹┖
-			if (com.alibaba.druid.util.StringUtils.isEmpty(fse.getString("uuid"))) {
+			if (StringUtils.isEmpty(fse.getUUID())) {
 				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_COUNT.getValue(),
 						SystemCode.SYSTEM_FORM_COUNT.getText());
 				return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -486,26 +291,9 @@
 	@ApiVersion(1)
 	public String delectAnnouncement(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			// 鍒ゆ柇uuid鏄惁涓虹┖
-			if (com.alibaba.druid.util.StringUtils.isEmpty(fse.getString("uuid"))) {
+			if (StringUtils.isEmpty(fse.getUUID())) {
 				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_COUNT.getValue(),
 						SystemCode.SYSTEM_FORM_COUNT.getText());
 				return this.error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
@@ -532,24 +320,7 @@
 	@ApiVersion(1)
 	public String listAnnouncementGateway(HttpServletRequest request) {
 		try {
-			FieldSetEntity fse = null;
-			Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
-			if (bean != null) {
-				RequestParameterEntity reqp = (RequestParameterEntity) bean;
-				fse = reqp.getFormData();
-			}
-			// 鍒ゆ柇鍙傛暟鏄惁涓虹┖
-			if (bean == null || fse == null) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_FORM_NODATA.getValue(),
-						SystemCode.SYSTEM_FORM_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_FORM_NODATA.getValue(), SystemCode.SYSTEM_FORM_NODATA.getText());
-			}
-			// 鍒ゆ柇琛ㄥ悕鏄惁姝e父
-			if (!CmnConst.product_oa_ANNOUNCEMENT.equals(fse.getTableName())) {
-				SpringMVCContextHolder.getSystemLogger().error(SystemCode.SYSTEM_TABLE_NODATA.getValue(),
-						SystemCode.SYSTEM_TABLE_NODATA.getText());
-				return this.error(SystemCode.SYSTEM_TABLE_NODATA.getValue(), SystemCode.SYSTEM_TABLE_NODATA.getText());
-			}
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, CmnConst.PRODUCT_OA_ANNOUNCEMENT);
 			return OK_List(announcementService.listAnnouncementGateway(fse));
 		} catch (BaseException e) {
 			SpringMVCContextHolder.getSystemLogger().error(e);

--
Gitblit v1.9.2