Merge remote-tracking branch 'origin/featCnbg-supervFilter-20250325' into cnbg-master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1976,7 +1976,7 @@ private Page<WmTask> getReviewTaskPage(WmSupervisionDto.OnTaskSupervisionPage qu
 
       // 如果监督记录创建人不是当前人，就记录监督意见
       if (!StrUtil.equals(operator.getUsername(), supervision.getCreateBy())
-        && !CollUtil.containsAny(Arrays.asList(operator.getRoles()), List.of(49, 52, 53, 56))) { // 监督员
+        && !CollUtil.containsAny(SecurityUtils.getRoles(), List.of(49, 52, 53, 56))) { // 不是监督员
         modifiable = !resource.getSupervision();
         if (resource.getSupervision()) {
             remarks = supervision.getSupervisionResult() ? "同意监督结果，监督无异常" : "同意监督结果，不符合合规要求，不建议结算";