Prechádzať zdrojové kódy

2023-3-30 补全值班人员头像图片全路径。

chaiyunlong 2 rokov pred
rodič
commit
1079b12fc1

+ 13 - 3
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpDutyController.java

@@ -5,6 +5,7 @@ import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpDuty;
@@ -22,9 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 /**
 /**
  * 值班Controller
  * 值班Controller
@@ -43,6 +42,9 @@ public class LabXxpDutyController extends BaseController
     @Autowired
     @Autowired
     private TokenService tokenService;
     private TokenService tokenService;
 
 
+    @Autowired
+    private FileConfigUtils fileConfigUtils;
+
     /**
     /**
      * 查询值班列表
      * 查询值班列表
      */
      */
@@ -188,6 +190,14 @@ public class LabXxpDutyController extends BaseController
     public ResultData<List<Map<String,Object>>> selectDutyUserList(Long labId,String startTime,String endTime)
     public ResultData<List<Map<String,Object>>> selectDutyUserList(Long labId,String startTime,String endTime)
     {
     {
         List<Map<String,Object>> list = xxpDutyService.selectDutyUserList(labId,startTime,endTime);
         List<Map<String,Object>> list = xxpDutyService.selectDutyUserList(labId,startTime,endTime);
+        Optional.ofNullable(list).orElseGet(Collections::emptyList)
+                .stream()
+                .forEach(a->{
+                    if(StringUtils.isNotNull(a.get("userImg"))){
+                        String url = fileConfigUtils.getFileDomainApp() + a.get("userImg");
+                        a.put("userImg",url);
+                    }
+                });
         return ResultData.success(list);
         return ResultData.success(list);
     }
     }
 }
 }