From 9df95cfc0f6109d0cc04657d26a2c9af033950d9 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 11 一月 2024 13:37:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index ccdd149..6970cce 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.entity.SysConfig;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
@@ -25,6 +26,7 @@
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.utils.data.Query;
import com.ruoyi.utils.gis.GisUtil;
import lombok.ToString;
@@ -50,6 +52,9 @@
private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
@Autowired
protected Validator validator;
+
+ @Resource
+ protected SysDeptMapper sysDeptMapper;
/**
* 鏌ヨ浜曠鐞�
@@ -424,8 +429,15 @@
}
if(ardAlarmpointsWell.getDeptId() != null){
result.put("deptId",ardAlarmpointsWell.getDeptId());
+ SysDept sysDept = sysDeptMapper.selectDeptById(ardAlarmpointsWell.getDeptId());//鏌ヨ鍏磋叮鐐规墍鍦ㄩ儴闂�
+ if(sysDept != null){
+ result.put("deptName",sysDept.getDeptName());
+ }else{
+ result.put("deptName","");
+ }
}else{
result.put("deptId","");
+ result.put("deptName","");
}
if(ardAlarmpointsWell.getCreateBy() != null){
result.put("createBy",ardAlarmpointsWell.getCreateBy());
--
Gitblit v1.9.3