Sfoglia il codice sorgente

核查任务列表优化

rengb 4 anni fa
parent
commit
e313673060
1 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 6 1
      src/main/java/com/diagbot/facade/RecordCheckFacade.java

+ 6 - 1
src/main/java/com/diagbot/facade/RecordCheckFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.CheckedRecordListDTO;
+import com.diagbot.dto.SysUserDeptDTO;
 import com.diagbot.entity.MedCheckInfo;
 import com.diagbot.entity.MedQcresultDetail;
 import com.diagbot.entity.SysUserDept;
@@ -53,7 +54,11 @@ public class RecordCheckFacade {
         SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
         sysUserBaseVO.setUserId(userId);
         List<Long> roleIds = sysUserFacade.getUserRoles(sysUserBaseVO).getSelRoles().stream().map(i -> i.getId()).collect(Collectors.toList());
-        List<String> deptIds = sysUserFacade.getUserDepts(sysUserBaseVO).getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList());
+        List<String> deptIds = Lists.newArrayList();
+        SysUserDeptDTO sysUserDeptDTO = sysUserFacade.getUserDepts(sysUserBaseVO);
+        if (ListUtil.isNotEmpty(sysUserDeptDTO.getSelDepts())) {
+            deptIds.addAll(sysUserDeptDTO.getSelDepts().stream().map(i -> i.getDeptId()).collect(Collectors.toList()));
+        }
 
         List<Long> userIds = Lists.newArrayList();
         roleIds.forEach(roleId -> {