‘linchangsheng’ 4 months ago
parent
commit
8265d7b61e

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WorkerNumberCheckVO.java

@@ -54,6 +54,6 @@ public class WorkerNumberCheckVO     {
     private String workerNumberYun;
 
     @ApiModelProperty(value = "广佛家用系统师傅编号")
-    @ZfireField(tbName = "c",colName = "worker_number")
+    @ZfireField(tbName = "d",colName = "worker_number")
     private String workerNumber;
 }

+ 3 - 3
mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1620,7 +1620,7 @@
         </if>
         HAVING a.worker_number_yun != d.worker_number
         <if test="ex.orderBy == null or ex.orderBy ==''">
-            ORDER BY a.websit_id,a.worker_number DESC
+            ORDER BY a.websit_id,a.worker_number_yun DESC
         </if>
         ${ex.orderBy}
     </select>
@@ -1631,7 +1631,7 @@
         (
         SELECT
         a.worker_number_yun,
-        c.worker_number
+        d.worker_number
         FROM
         worker_number_check a
         JOIN `user` c on c.nick_name = a.worker_name and RIGHT(c.mobile,4) = RIGHT(a.worker_phone_yun,4)
@@ -1644,7 +1644,7 @@
                 #{item}
             </foreach>
         </if>
-        HAVING a.worker_number_yun != c.worker_number or c.worker_number is null
+        HAVING a.worker_number_yun != d.worker_number
         ) s