From e2408d846fe85e118a046aa204ea64ff2cc245ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 7 Feb 2025 21:07:54 +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

---
 .../nflg/mobilebroken/common/pojo/vo/AppUserVO.java  |  3 +++
 .../src/main/resources/mapper/AppUserMapper.xml      | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java
index ac74929d..7fce8336 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppUserVO.java
@@ -54,4 +54,7 @@ public class AppUserVO {
 
     //销售人员姓名
     private String salesUserName;
+
+    //状态，0：审核中，1：使用中，2：已过期
+    private Integer state;
 }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
index 0b4726ad..e9f84bf6 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.nflg.mobilebroken.repository.mapper.AppUserMapper">
 
     <select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
-        SELECT u.id,c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar,a.`name` AS 'areaName',u.`enable`,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'
+        SELECT u.id,c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar,a.`name` AS 'areaName',u.`enable`,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',IF(u.expire_time>now(),1,2) AS 'state'
         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
@@ -26,6 +26,16 @@
                 )
             </if>
         </where>
+        UNION
+        SELECT u.id,c.agency_company_name AS 'companyName',u.user_name AS 'name',u.user_email AS 'email',u.user_avatar AS 'avatar',a.`name` AS 'areaName',false AS `enable`,uc.`name` AS 'createBy',u.create_time AS 'createTime',null AS 'updateBy',null AS 'updateTime',null AS 'lastLoginTime',null AS 'expireTime',false AS 'isPrimary',0 AS 'state'
+        FROM app_user_applyfor 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
+        WHERE u.company_id IN
+        <foreach collection="request.companyIds" item="companyId" open="(" separator="," close=")">
+            #{companyId}
+        </foreach>
     </select>
     <select id="getInfo" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
         SELECT u.id,c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar,a.`name` AS 'areaName',u.`enable`,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'