From a9db4f2b35fe73e79fd695ef4192e771671c0de1 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 二月 2020 00:54:55 +0800
Subject: [PATCH] 加入组织隶属功能

---
 WebService/src/main/java/com/java110/web/smo/notice/impl/ListNoticesSMOImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/smo/notice/impl/ListNoticesSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/notice/impl/ListNoticesSMOImpl.java
index 0a369c7..98c4796 100644
--- a/WebService/src/main/java/com/java110/web/smo/notice/impl/ListNoticesSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/notice/impl/ListNoticesSMOImpl.java
@@ -1,15 +1,16 @@
 package com.java110.web.smo.notice.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.common.util.BeanConvertUtil;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
 import com.java110.web.smo.notice.IListNoticesSMO;
 import org.springframework.web.client.RestTemplate;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
-import com.java110.web.core.AbstractComponentSMO;
+import com.java110.core.component.AbstractComponentSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -36,7 +37,9 @@
 
         super.validatePageInfo(pd);
 
-        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_NOTICE);
+        Assert.hasKeyAndValue(paramIn, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯ID");
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.HAS_LIST_NOTICE);
     }
 
     @Override
@@ -45,6 +48,8 @@
 
         Map paramMap = BeanConvertUtil.beanCovertMap(result);
         paramIn.putAll(paramMap);
+        //灏嗙敤鎴稩D鍒锋帀
+        paramIn.remove("userId");
 
         String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/notice.listNotices" + mapToUrlParam(paramIn);
 

--
Gitblit v1.8.0