已有专题列表优化

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -180,6 +180,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
         SpecialSubjectEntity original = baseDao.selectById(formDTO.getSpecialSubjectId());
         if (null != original) {
             if (!original.getAddOrgId().equals(formDTO.getOrgId())) {
+                log.warn("当前专题id=" + original.getId() + ";是属于orgId=" + original.getAddOrgId() + ";当前用户正处在orgId=" + formDTO.getOrgId()+";所以无权删除");
                 throw new RenException(EpmetErrorCode.CAN_NOT_DEL_SPECIAL_PROJECT.getCode(), EpmetErrorCode.CAN_NOT_DEL_SPECIAL_PROJECT.getMsg());
             }
             baseDao.delSpecialSubject(formDTO.getSpecialSubjectId(), formDTO.getUserId());
@@ -213,8 +214,10 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
             result.setSpecialSubjectId(dto.getId());
             result.setTagId(dto.getTagId());
             result.setTagName(dto.getTagName());
-            //当前工作人员所属的组织，与当时添加人所属的组织一致时，即可删除
+            //1、如果当前专题是给当前所在组织(or网格)添加的；
-            if(dto.getAddUserAgencyId().equals(staffResult.getData().getAgencyId())){
+            //2、当前工作人员所属的组织，与专题添加人所属的组织一致，同时满足这两个条件即可删除
+            if(dto.getAddUserAgencyId().equals(staffResult.getData().getAgencyId())
+                && dto.getAddOrgId().equals(formDTO.getOrgId())){
                 result.setCanDel(true);
             }else{
                 result.setCanDel(false);
@@ -243,10 +246,12 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
                     result.setSpecialSubjectId(dto.getId());
                     result.setTagId(dto.getTagId());
                     result.setTagName(dto.getTagName());
-                    //当前工作人员所属的组织，与当时添加人所属的组织一致时，即可删除
+                    //1、如果当前专题是给当前所在组织(or网格)添加的；
-                    if(dto.getAddUserAgencyId().equals(staffResult.getData().getAgencyId())){
+                    //2、当前工作人员所属的组织，与专题添加人所属的组织一致，同时满足这两个条件即可删除
+                    if (dto.getAddUserAgencyId().equals(staffResult.getData().getAgencyId())
+                            && dto.getAddOrgId().equals(formDTO.getOrgId())) {
                         result.setCanDel(true);
-                    }else{
+                    } else {
                         result.setCanDel(false);
                     }
                     result.setAddOrgId(dto.getAddOrgId());