From 86c58c72c42e3e5579692950bb86ee72c5954837 Mon Sep 17 00:00:00 2001
From: zfhai <15856818120@163.com>
Date: Sun, 10 Dec 2023 00:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zlpt/equip/service/impl/DevInfoServiceImpl.java      | 9 +++++----
 .../src/main/resources/mapper/DevInfoMapper.xml          | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index cfac261..2111ec5 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -15,6 +15,7 @@ import com.bonus.zlpt.equip.api.enums.MaStatusEnum;
 import com.bonus.zlpt.system.api.domain.BaseAddress;
 import com.bonus.zlpt.system.api.domain.SysDic;
 import com.bonus.zlpt.system.api.model.LoginUser;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
 import org.springframework.stereotype.Service;
@@ -86,13 +87,13 @@ public class DevInfoServiceImpl implements IDevInfoService
 
             List<BaseAddress> addressList = devInfoMapper.getBaseAddress();
             for (BaseAddress address : addressList) {
-                if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getCode()))) {
+                if (devInfoVo.getProvinceId().equals(Integer.valueOf(address.getCode()))) {
                     devInfoVo.setProvinceStr(address.getName());
                 }
-                if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) {
+                if (devInfoVo.getCityId().equals(Integer.valueOf(address.getCode()))) {
                     devInfoVo.setCityStr(address.getName());
                 }
-                if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getCode()))) {
+                if (devInfoVo.getAreaId().equals(Integer.valueOf(address.getCode()))) {
                     devInfoVo.setAreaStr(address.getName());
                 }
             }
@@ -195,7 +196,7 @@ public class DevInfoServiceImpl implements IDevInfoService
 //                if (String.valueOf(devInfoVo.getProvinceId()).equals(String.valueOf(address.getId()))) {
 //                    devInfoVo.setProvinceStr(address.getName());
 //                }
-                if (String.valueOf(devInfoVo.getCityId()).equals(String.valueOf(address.getCode()))) {
+                if (devInfoVo.getCityId().equals(Integer.valueOf(address.getCode()))) {
                     devInfoVo.setCityStr(address.getName());
                 }
 //                if (String.valueOf(devInfoVo.getAreaId()).equals(String.valueOf(address.getId()))) {
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index ab3eae9..12f15f6 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                creator, update_time, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info
     </sql>
 
+
+
     <select id="selectDevInfoList" parameterType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">
         select d.*,mt1.type_name as device_name, mt2.type_name as group_name, mt3.type_name as type_name,c.company_name
         from ma_dev_info d
@@ -438,7 +440,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getBaseAddress" resultType="com.bonus.zlpt.system.api.domain.BaseAddress">
-        select id,name from base_address where status = 1
+        select id,name,code from base_address where status = 1
     </select>
 
     <select id="getBaseAddressById" resultType="String">