From 98a61c602c6455225a3462e5b79f74d108009dd5 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 9 Mar 2023 16:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=81=8C=E4=BD=8D=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=98=AF=E7=9A=84sql=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                          | 5 -----
 src/main/resources/mapper/generator/StaffDao.xml | 2 +-
 src/test/java/com/lz/mysql/MysqlMain.java        | 8 ++++----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 70931a26..0edf7dae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,11 +277,6 @@
 			<artifactId>socket.io-client</artifactId>
 			<version>1.0.1-lz</version>
 		</dependency>
-
-
-
-
-
 	</dependencies>
 
 	<build>
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index eea5db1a..ea75b1b4 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -441,7 +441,7 @@
     </select>
 
     <select id="selectBySearchName" resultType="com.lz.modules.app.entity.SearchStaffEntity">
-        select staf.id, staf.name, occ.position, concat(staf.name, '-', occ.position) as 'desc' from lz_staff staf LEFT JOIN lz_staff_occupation occ on staf.id = occ.staff_id where staf.is_delete = 0
+        select staf.id, staf.name, occ.position, concat(staf.name, '-', if(occ.position is null, '', occ.position)) as 'desc' from lz_staff staf LEFT JOIN lz_staff_occupation occ on staf.id = occ.staff_id where staf.is_delete = 0
          <if test="model.name != null and model.name != ''"></if>
           AND staf.name LIKE CONCAT('%',#{model.name},'%')
     </select>
diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java
index 32867660..ce3275f2 100644
--- a/src/test/java/com/lz/mysql/MysqlMain.java
+++ b/src/test/java/com/lz/mysql/MysqlMain.java
@@ -45,7 +45,7 @@ public class MysqlMain {
     public static String pre = "";
 
 
-    public static String mysql_dbname = "lz_management";
+    public static String mysql_dbname = "pay_database";
 
     public static String mysql_username = "ldd_biz";
     public static String mysql_password = "Hello1234";
@@ -85,9 +85,9 @@ public class MysqlMain {
         List<TablesBean> list = new ArrayList<TablesBean>();
 
 
-        list.add(new TablesBean("mcdonald_coupon_use_record"));
-        list.add(new TablesBean("mcdonald_coupon"));
-
+        list.add(new TablesBean("schedule_job"));
+        list.add(new TablesBean("schedule_job_log"));
+        //list.add(new TablesBean("zns_treadmill"));
 
         List<TablesBean> list2 = new ArrayList<TablesBean>();
         Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();