renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
feng
2025-12-13 18:39:54 +08:00
parent 9b15cb694d
commit 6c3047abf2
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java
+1 -1
View File
@@ -295,7 +295,7 @@ public class LargeScreenNewController {
*/ */
@GetMapping("careUser") @GetMapping("careUser")
public Result<CareUserVO> careUser(@RequestParam(name = "userId") String userId, public Result<CareUserVO> careUser(@RequestParam(name = "userId") String userId,
@RequestParam(name = "workNo") String workNo){ @RequestParam(name = "workNo",required = false) String workNo){
return Result.ok(largeScreenDataService.careUser(userId,workNo)); return Result.ok(largeScreenDataService.careUser(userId,workNo));
} }
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java
+8 -1
View File
@@ -32,6 +32,7 @@ import com.renkang.emergency.service.IXjAedService;
import com.renkang.watch.api.WatchApi; import com.renkang.watch.api.WatchApi;
import com.renkang.watch.vo.WatchMonitorDataVo; import com.renkang.watch.vo.WatchMonitorDataVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.jeecg.bean.response.BaseEmployeeInfo;
import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.global.GlobalUtils; import org.jeecg.global.GlobalUtils;
@@ -871,7 +872,13 @@ public class LargeScreenDataServiceImpl extends ServiceImpl<LargeScreenDataMappe
careUserVO.setLifeguardName(healthUserEmployeeExes.get(0).getLifeguardName()); careUserVO.setLifeguardName(healthUserEmployeeExes.get(0).getLifeguardName());
careUserVO.setLifeguardPhone(healthUserEmployeeExes.get(0).getLifeguardPhone()); careUserVO.setLifeguardPhone(healthUserEmployeeExes.get(0).getLifeguardPhone());
}*/ }*/
if(StrUtil.isEmpty(workNo)){
//通过用户ID查工号 解决前端传值有问题
List<BaseEmployeeInfo> employeeInfos = sysBaseAPI.queryBaseEmployeeInfo(new HashSet<>(Arrays.asList(userId)));
if(null != employeeInfos && employeeInfos.size()>0){
workNo = employeeInfos.get(0).getWorkNo();
}
}
if(StrUtil.isNotEmpty(workNo)){ if(StrUtil.isNotEmpty(workNo)){
try { try {
EmergencyContactParam param = new EmergencyContactParam(); EmergencyContactParam param = new EmergencyContactParam();