feats

src/main/java/com/example/civilizedcity/controller/TaMessageController.java

@@ -70,21 +70,9 @@ public class TaMessageController extends BaseController {
         IPage<TaMessage> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMessage> queryWrapper = new QueryWrapper<>();
 
-        // 如果是管理员
-        if (dutyList.contains(Constants.DUTY_MANAGER)) {
-            // 可以查询当前单位以及给自己的
-            queryWrapper.nested(q -> q.eq("org_id", Constants.ROOT_ORG).or().eq("receive_user", sysUser.getUserId()));
-        } else if (dutyList.contains(Constants.DUTY_INSPECTOR)) {
-            // 督察员只能查询给自己的
-            queryWrapper.eq("receive_user", sysUser.getUserId());
-        } else if (dutyList.contains(Constants.DUTY_ORG_USER)) {
-            // 交办单位的，可以查询给本单位的
+        // 交办单位的，只能查询本单位的
+        if (dutyList.contains(Constants.DUTY_ORG_USER) || dutyList.contains(Constants.DUTY_ORG_MANAGER)) {
             queryWrapper.eq("org_id", sysUser.getOrgId());
-            queryWrapper.ne("msg_type", "apply-verify");
-        } else if (dutyList.contains(Constants.DUTY_ORG_MANAGER)) {
-            // 交办单位管理员, 只能查询 问题单提审 类型的消息
-            queryWrapper.eq("org_id", sysUser.getOrgId());
-            queryWrapper.eq("msg_type", "apply-verify");
         }
 
         queryWrapper.eq("status", Constants.STATUS_NORMAL);

src/main/java/com/example/civilizedcity/service/impl/TaOrgIssueServiceImpl.java

@@ -124,7 +124,7 @@ public class TaOrgIssueServiceImpl extends BaseServiceImpl<TaOrgIssueMapper, TaO
         }
 
         // 删除部分文件
-        taAttachMapper.deleteNotIn(idList, Constants.SOURCE_ISSUE, taOrgIssue.getOrgIssueId().toString());
+        taAttachMapper.deleteNotIn(idList, Constants.SOURCE_ORG_ISSUE, taOrgIssue.getOrgIssueId().toString());
         taOrgIssue.setAttachList(attachList);
     }
 }