From dd3030050a4301599a4b2e7410adf18dd5d14417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 19 Feb 2025 19:13:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/bootstrap-dev.properties    |  2 +-
 .../main/resources/bootstrap-dev.properties    |  2 +-
 .../main/resources/bootstrap-dev.properties    |  2 +-
 .../impl/AppUserApplyforServiceImpl.java       |  2 +-
 .../main/resources/mapper/AppUserMapper.xml    | 18 ++++++++++--------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/resources/bootstrap-dev.properties b/nflg-mobilebroken-admin/src/main/resources/bootstrap-dev.properties
index 498b9ddb..3e8f7af9 100644
--- a/nflg-mobilebroken-admin/src/main/resources/bootstrap-dev.properties
+++ b/nflg-mobilebroken-admin/src/main/resources/bootstrap-dev.properties
@@ -1,5 +1,5 @@
 # Nacos 地址
-nacos.server-addr=112.74.186.154:8848
+nacos.server-addr=${NACOS_SERVER_ADDR:112.74.186.154:8848}
 #nacos.server-addr=192.168.0.194:8848
 #spring.cloud.nacos.discovery.username=nacos
 #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_
diff --git a/nflg-mobilebroken-auth/src/main/resources/bootstrap-dev.properties b/nflg-mobilebroken-auth/src/main/resources/bootstrap-dev.properties
index 498b9ddb..3e8f7af9 100644
--- a/nflg-mobilebroken-auth/src/main/resources/bootstrap-dev.properties
+++ b/nflg-mobilebroken-auth/src/main/resources/bootstrap-dev.properties
@@ -1,5 +1,5 @@
 # Nacos 地址
-nacos.server-addr=112.74.186.154:8848
+nacos.server-addr=${NACOS_SERVER_ADDR:112.74.186.154:8848}
 #nacos.server-addr=192.168.0.194:8848
 #spring.cloud.nacos.discovery.username=nacos
 #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_
diff --git a/nflg-mobilebroken-cfs-app/src/main/resources/bootstrap-dev.properties b/nflg-mobilebroken-cfs-app/src/main/resources/bootstrap-dev.properties
index 498b9ddb..3e8f7af9 100644
--- a/nflg-mobilebroken-cfs-app/src/main/resources/bootstrap-dev.properties
+++ b/nflg-mobilebroken-cfs-app/src/main/resources/bootstrap-dev.properties
@@ -1,5 +1,5 @@
 # Nacos 地址
-nacos.server-addr=112.74.186.154:8848
+nacos.server-addr=${NACOS_SERVER_ADDR:112.74.186.154:8848}
 #nacos.server-addr=192.168.0.194:8848
 #spring.cloud.nacos.discovery.username=nacos
 #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
index 4e109fae..3e3bf87c 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
@@ -189,7 +189,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
             } else if (applyfor.getType() == AppUserApplyforType.EXTENSION.getState().byteValue()) {
                 //账号延期
                 AppUser appUser = appUserService.getById(applyfor.getUserId());
-                appUser.setExpireTime(appUser.getExpireTime())
+                appUser.setExpireTime(appUser.getExpireTime().plusYears(1))
                         .setUpdateBy(applyfor.getCreateBy())
                         .setUpdateTime(LocalDateTime.now());
                 appUserService.updateById(appUser);
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
index e888d619..20a099c0 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
@@ -38,15 +38,17 @@
         </foreach>
     </select>
     <select id="getInfo" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
-        SELECT u.id,u.area_id AS 'areaId',c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar,a.`name` AS 'areaName'
-                   ,u.state AS 'userState',uc.`name` AS 'createBy',u.create_time AS 'createTime',uu.`name` AS 'updateBy'
-                   ,u.update_time AS 'updateTime',u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime'
-                   ,u.is_primary AS 'isPrimary',u.login_name AS 'loginName',u.phone
+        SELECT u.id,u.area_id AS 'areaId',c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar
+                   ,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',u.state AS 'userState',uc.`name` AS 'createBy'
+                   ,u.create_time AS 'createTime',uu.`name` AS 'updateBy',u.update_time AS 'updateTime'
+                   ,u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary'
+                   ,u.login_name AS 'loginName',u.phone
         FROM app_user u
-                 INNER JOIN t_base_customer c ON u.company_id=c.id
-                 INNER JOIN app_area a ON u.area_id=a.id
-                 LEFT JOIN app_user uc ON u.create_by=uc.id
-                 LEFT JOIN app_user uu ON u.update_by=uu.id
+         INNER JOIN t_base_customer c ON u.company_id = c.id
+         LEFT JOIN t_base_area a1 ON u.area_id = a1.id
+         LEFT JOIN app_area a2 ON u.area_id = a2.id
+         LEFT JOIN app_user uc ON u.create_by = uc.id
+         LEFT JOIN app_user uu ON u.update_by = uu.id
         WHERE u.id = #{userId}
     </select>