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

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -710,6 +710,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         boolean party = false;
         //网格指导员角色
         boolean gridParty = false;
+        //2022.7.5  pc端党建声音可选发布范围为当前组织及下级组织的网格，不在区分角色
+        party = true;
+        /*
         for (CustomerStaffRoleListResultDTO role : RoleList) {
             if (CustomerAgencyConstant.PARTY_PRINCIPALS.equals(role.getRoleKey())) {
                 party = true;
@@ -720,7 +723,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         }
         if (!party && !gridParty) {
             return returnDTO;
-        }
+        }*/
 
         //4:根据不同角色查询不同数据
         CustomerAgencyEntity agencyEntity = baseDao.selectById(staffAgencyDTO.getAgencyId());