From 793a8667b34f33bcd2977ddad65c94ff16aa0c04 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 13 一月 2023 09:23:52 +0800
Subject: [PATCH] #
---
/dev/null | 18 ------------------
src/main/resources/mapper/LocMastMapper.xml | 4 ++--
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/main/java/checkRecord.sql b/src/main/java/checkRecord.sql
deleted file mode 100644
index 5b2a76d..0000000
--- a/src/main/java/checkRecord.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- save checkRecord record
--- mysql
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord/checkRecord.html', 'checkRecord绠＄悊', null , '2', null , '1');
-
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#view', '鏌ヨ', '', '3', '0', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-add', '鏂板', '', '3', '1', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-edit', '缂栬緫', '', '3', '2', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-delete', '鍒犻櫎', '', '3', '3', '1');
-insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'checkRecord#btn-export', '瀵煎嚭', '', '3', '4', '1');
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord/checkRecord.html', N'checkRecord绠＄悊', null, '2', null, '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#view', N'鏌ヨ', '60586', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-add', N'鏂板', '60586', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-edit', N'缂栬緫', '60586', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-delete', N'鍒犻櫎', '60586', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'checkRecord#btn-export', N'瀵煎嚭', '60586', '3', '4', '1');
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index d903576..e02bf3b 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -107,10 +107,10 @@
</if>
<choose>
<when test="inoutEveryday != null and inoutEveryday">
- AND bay1 < 11 and lev1 in (2,3,4)
+ AND bay1 < 11 and lev1 in (3,4)
</when>
<otherwise>
- AND (bay1 >= 11 or (bay1 < 11 and lev1 in (1)))
+ AND (bay1 >= 11 or (bay1 < 11 and lev1 in (1,2)))
</otherwise>
</choose>
and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
--
Gitblit v1.9.1