From 15167e0adc11dbd1e5756f8d56e7ae7844aa4d85 Mon Sep 17 00:00:00 2001
From: rbw <2051606263@qq.com>
Date: Mon, 18 Nov 2024 18:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archives/plantuser/PlantuserApi.java      |  6 +++++-
 .../plantuser/PlantUserMapper.xml             |  7 +++++++
 crmpoject.iml                                 | 21 +------------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java b/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java
index ccbec41..8ce9e7c 100644
--- a/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java
+++ b/crm-admin/src/main/java/com/yb/lb/webapp/archives/plantuser/PlantuserApi.java
@@ -478,7 +478,11 @@ public class PlantuserApi {
                     if (!("").equals(documentsStatus) && documentsStatus != null) {
                         params.put("documentsStatus", documentsStatus);
                     }
-                    params.put("status", status);
+                    if (StringUtil.isNotEmpty(status) && status.contains(",")) {
+                        params.put("statusArr", status);
+                    } else {
+                        params.put("status", status);
+                    }
                     params.put("keyWords", keyWords);
                     params.put("plantNo", plantNo);
                     params.put("plantName", plantName);
diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PlantUserMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PlantUserMapper.xml
index 10b5062..9c2531a 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PlantUserMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/plantuser/PlantUserMapper.xml
@@ -154,6 +154,13 @@
 			<if test="status !=null and status !=''">
 				and a.status = #{status}
 			</if>
+			<if test="statusArr !=null and statusArr !=''">
+				and a.status in
+				<foreach collection="statusArr" item="item" open="(" close=")"
+						 separator=",">
+					#{item}
+				</foreach>
+			</if>
 			<if test="phone !=null and phone !=''">
 				and a.phone = #{phone}
 			</if>
diff --git a/crmpoject.iml b/crmpoject.iml
index 968e3d5..62eb981 100644
--- a/crmpoject.iml
+++ b/crmpoject.iml
@@ -1,31 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.4.4" level="project" />