From c57d25e25224a5539b228d7a4f7eb2fe54a69327 Mon Sep 17 00:00:00 2001
From: wuhan <18852676227@163.com>
Date: Fri, 1 Mar 2024 18:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=A2=9E=E5=8A=A0=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                |  4 +++-
 src/client/client.mapper.ts | 31 ++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 494733e..6a11562 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,8 @@
     "start:debug": "cross-env RUNNING_ENV=dev nest start --debug --watch",
     "start:hotdev": "cross-env RUNNING_ENV=dev nest build --webpack --webpackPath webpack-hmr.config.js --watch",
     "start:prod": "node dist/main",
+    "db": "docker build -t drive:1.0.0 .",
+    "ds": "docker save -o drive-1.0.0.zip drive:1.0.0",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -100,4 +102,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}
\ No newline at end of file
diff --git a/src/client/client.mapper.ts b/src/client/client.mapper.ts
index 4baf8bc..8a5a585 100644
--- a/src/client/client.mapper.ts
+++ b/src/client/client.mapper.ts
@@ -73,11 +73,32 @@ class ClientMapper {
 
   async queryUserNum({ areaCode }) {
     const obj: any = {};
-    if (areaCode) {
-      obj.areaCode = Like(`${areaCode}%`);
-      return UserInfo.find({
-        where: obj,
-      });
+    if (areaCode && areaCode.length == 2) {
+      // obj.areaCode = Like(`${areaCode}%`);
+      // return UserInfo.find({
+      //   where: obj,
+      // });
+      return UserInfo.createQueryBuilder()
+        .where(`areaCode like :areaCode`, { areaCode: `${areaCode}%` })
+        .andWhere(`length(areaCode) = 4`)
+        .select('areaCode')
+        .addSelect('areaName')
+        .addSelect('userNum')
+        .addSelect('type')
+        .getRawMany();
+    } else if (areaCode && areaCode.length == 4) {
+      // obj.areaCode = Like(`${areaCode}%`);
+      // return UserInfo.find({
+      //   where: obj,
+      // });
+      return UserInfo.createQueryBuilder()
+        .where(`areaCode like :areaCode`, { areaCode: `${areaCode}%` })
+        .andWhere(`length(areaCode) = 6`)
+        .select('areaCode')
+        .addSelect('areaName')
+        .addSelect('userNum')
+        .addSelect('type')
+        .getRawMany();
     } else {
       return UserInfo.createQueryBuilder()
         .where(`length(areaCode) = 2`)