feat: supervision by drug ignore 39 37

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

@@ -36,6 +36,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskSupervisionService;
 import com.qunzhixinxi.hnqz.admin.service.WmWarnUserRelationService;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -98,13 +99,23 @@ public class WmSupervisionManager {
 
         Page<Map<String, Object>> page = new Page<>(query.getCurrent(), query.getSize());
 
-        List<Integer> drugIds = userDrugService.listDrugIdByUserId(operator.getId());
+        List<Integer> drugIds = null;
 
-        if (CollUtil.isEmpty(drugIds)){
-            log.info("当前操作人没有分配产品");
-            return page;
+
+        if (!SecurityUtils.getRoles().contains(39) && !SecurityUtils.getRoles().contains(37)) {
+
+            drugIds = userDrugService.listDrugIdByUserId(operator.getId());
+
+            if (CollUtil.isEmpty(drugIds)) {
+                log.info("当前操作人没有分配产品");
+                return page;
+            }
+
+        } else {
+            drugIds = Collections.emptyList();
         }
 
+
         // 筛查区域和服务商名称
         List<Long> areaCode = query.getAreaCode();
         List<Long> entIds;