报警设置查询加返回机构名称

sms_water/src/main/java/com/huaxu/controller/AlarmSettingController.java

@@ -12,6 +12,7 @@ import com.huaxu.model.ResultStatus;
 import com.huaxu.service.AlarmSettingService;
 import com.huaxu.service.SceneService;
 import com.huaxu.util.UserUtil;
+import com.huaxu.util.OrgInfoUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -109,6 +110,11 @@ public class AlarmSettingController {
         IPage<AlarmSettingDto> iPage = new Page<>(pageNum, pageSize);
         iPage = alarmSettingService.selectPage(iPage, alarmSettingDto);
         Pagination<AlarmSettingDto> pages = new Pagination<>(iPage);
+        OrgInfoUtil orgInfoUtil = new OrgInfoUtil();
+        for(AlarmSettingDto alarm : pages.getList()){
+            alarm.setCompanyOrgName(orgInfoUtil.getOrgName(alarm.getCompanyOrgId()));
+            alarm.setDeptOrgName(orgInfoUtil.getOrgName(alarm.getDeptOrgId()));
+        }
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
     /**

sms_water/src/main/resources/mapper/AlarmSettingMapper.xml

@@ -67,7 +67,7 @@
         select t3.id attribute_id,t3.name attribute_name
         from  sms_device t1
         inner join sms_device_type t2 on t1.device_type_id=t2.id
-        inner join sms_device_attribute t3 on t2.id=t3.device_mode_id
+        inner join sms_device_attribute t3 on t2.id=t3.device_type_id
         where t1.id=#{deviceId} and t3.status=1
     </select>