Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java

@@ -113,12 +113,4 @@ public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> i
         return printLogMapper.getPrintLogListByCondition(printLog);
     }
 
-    @Scheduled(cron = "0 0/3 20 * * ? ")
-    public void myTask(){
-        List<PrintLog> list = printLogService.list();
-        for (PrintLog printLog:list) {
-            printLog.setModifiedDateTime(LocalDateTime.now());
-        }
-        printLogService.updateBatchById(list);
-    }
 }

dispatch/src/main/resources/mapper/CallItemMapper.xml

@@ -1090,7 +1090,7 @@
             AND ZCI.CALL_TYPE = #{callItem.callType}
         </if>
         <if test="user != null and user != ''">
-            AND '%' ||#{user} || '%'  LIKE ZSD.EMPLOYEE
+            AND ZSD.EMPLOYEE  LIKE  '%' ||#{user} || '%'
         </if>
         GROUP BY ZCI.SITE, CF.VALUE, ZCI.STATUS ,WC.WORK_CENTER, IM.ITEM, ZSD.BLANKING_SIZE, CP.ITEM, ZCI.RESRCE, ZCI.CALL_TYPE,ZCI.SHOP_ORDER ,ZCI.COMPONENT_BO ,
         WCT.DESCRIPTION ,IT.DESCRIPTION , ITT.DESCRIPTION ) MML