diff --git a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
index a709359..842a812 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseQualityInspectionItemMapper.xml
@@ -88,8 +88,8 @@
from STATION_DEFECT_RELATION sdr
left join BASE_QUALITY_INSPECTION_ITEM bq1 on sdr.defect_code = bq1.QUALITY_DEFECT_CODE
left join BASE_PRODUCTLINE pl on sdr.station_code = pl.PRODUCT_LINE_CODE
- left join SYS_DICT_DATA dl on dl.DICT_TYPE = 'defect_categories' and bq1.MATERIAL_CATEGORIES = dl.DICT_VALUE
- left join SYS_DICT_DATA xl on xl.DICT_TYPE = 'defect_subclass' and bq1.MATERIAL_SUBCLASS = xl.DICT_VALUE
+ left join Z_SYS_DICT_DATA dl on dl.DICT_TYPE = 'defect_categories' and bq1.MATERIAL_CATEGORIES = dl.DICT_VALUE
+ left join Z_SYS_DICT_DATA xl on xl.DICT_TYPE = 'defect_subclass' and bq1.MATERIAL_SUBCLASS = xl.DICT_VALUE
and sdr.station_code = #{stationCode}
diff --git a/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
index fe8b724..fa616d7 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
@@ -84,7 +84,7 @@
u.user_name userName
from base_teammembers tm
left join base_productline bpl on bpl.PRODUCT_LINE_CODE = tm.PRODUCT_LINE_CODE
- left join sys_user u on tm.TEAM_CODE = u.TEAM_CODE
+ left join Z_sys_user u on tm.TEAM_CODE = u.TEAM_CODE
u.user_name is not null
and tm.team_code = #{teamCode}
diff --git a/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java b/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java
index d42f543..c024ae7 100644
--- a/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java
+++ b/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java
@@ -114,7 +114,7 @@ public class DataScopeAspect
else if (DATA_SCOPE_CUSTOM.equals(dataScope))
{
sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
+ " OR {}.dept_id IN ( SELECT dept_id FROM Z_sys_role_dept WHERE role_id = {} ) ", deptAlias,
role.getRoleId()));
}
else if (DATA_SCOPE_DEPT.equals(dataScope))
@@ -124,7 +124,7 @@ public class DataScopeAspect
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
{
sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or 0 < find_in_set( {} , ancestors ) )",
+ " OR {}.dept_id IN ( SELECT dept_id from Z_sys_dept WHERE dept_id = {} or 0 < find_in_set( {} , ancestors ) )",
deptAlias, user.getDeptId(), user.getDeptId()));
}
else if (DATA_SCOPE_SELF.equals(dataScope))
diff --git a/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
index cc1d9b2..b0a81af 100644
--- a/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ b/aucma-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
@@ -17,7 +17,7 @@
select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
- from sys_job_log
+ from Z_sys_job_log
- delete from sys_job_log where job_log_id = #{jobLogId}
+ delete from Z_sys_job_log where job_log_id = #{jobLogId}
- delete from sys_job_log where job_log_id in
+ delete from Z_sys_job_log where job_log_id in
#{jobLogId}
- truncate table sys_job_log
+ truncate table Z_sys_job_log
- SELECT seq_sys_job_log.NEXTVAL as jobLogId FROM DUAL
+ SELECT seq_Z_sys_job_log.NEXTVAL as jobLogId FROM DUAL
- insert into sys_job_log(
+ insert into Z_sys_job_log(
job_log_id,job_name,job_group,
diff --git a/aucma-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/aucma-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
index 913ab5a..05f0f64 100644
--- a/aucma-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
+++ b/aucma-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
@@ -22,7 +22,7 @@
select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
- from sys_job
+ from Z_sys_job
- delete from sys_job where job_id = #{jobId}
+ delete from Z_sys_job where job_id = #{jobId}
- delete from sys_job where job_id in
+ delete from Z_sys_job where job_id in
#{jobId}
- update sys_job
+ update Z_sys_job
job_name = #{jobName},job_group = #{jobGroup},
@@ -83,9 +83,9 @@
- SELECT seq_sys_job.NEXTVAL as jobId FROM DUAL
+ SELECT seq_Z_sys_job.NEXTVAL as jobId FROM DUAL
- insert into sys_job(
+ insert into Z_sys_job(
job_id,job_name,job_group,
diff --git a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
index 995e503..b8828b5 100644
--- a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
@@ -89,7 +89,7 @@
SELECT xl.DICT_LABEL QUALITY_DEFECT_NAME, COUNT(*) SUM
FROM REPORT_QUALITY_INSPECTION QI
LEFT JOIN BASE_QUALITY_INSPECTION_ITEM QII ON QII.QUALITY_DEFECT_CODE = QI.QUALITY_DEFECT_CODE
- left join SYS_DICT_DATA xl
+ left join Z_SYS_DICT_DATA xl
on xl.DICT_TYPE = 'defect_subclass' and QII.MATERIAL_SUBCLASS = xl.DICT_VALUE
WHERE QI.QUALITY_DEFECT_NAME IS NOT NULL
AND TO_CHAR(INSPECTOR_TIME, 'YYYY-MM-DD') IN
diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index b88919f..ca8aa13 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -381,7 +381,7 @@
LEFT JOIN C##AUCMA_SCADA.CODE_BINDING CB ON PO.BOX_CODE = CB.BOX_CODE
JOIN REPORT_QUALITY_INSPECTION RQI ON ((RQI.BAR_CODE = PO.BOX_CODE) OR (RQI.BAR_CODE = CB.LINER_CODE))
LEFT JOIN BASE_PRODUCTLINE PL on RQI.STATION_CODE = PL.PRODUCT_LINE_CODE
- LEFT JOIN SYS_USER U on U.USER_NAME = RQI.INSPECTOR_CODE
+ LEFT join Z_SYS_USER U on U.USER_NAME = RQI.INSPECTOR_CODE
WHERE PO.BOX_CODE = #{BOX_CODE}
GROUP BY RQI.BAR_CODE, PL.EXECUTION_SORT, PL.PRODUCT_LINE_CODE, PL.PRODUCT_LINE_NAME, RQI.TREATMENT_MEASURE,
RQI.PROCESS_RESULT, RQI.INSPECTOR_TIME, U.NICK_NAME
diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
index d991d44..f5849d4 100644
--- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml
@@ -58,7 +58,7 @@
from report_quality_inspection rqi
left join BASE_PROCESS_STATION bps on bps.PROCESS_CODE = rqi.PROCESS_CODE
left join BASE_TEAMMEMBERS btm on btm.TEAM_CODE = rqi.group_code
- left join SYS_USER su on su.USER_NAME = rqi.inspector_code
+ left join Z_SYS_USER su on su.USER_NAME = rqi.inspector_code
left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = rqi.STATION_CODE
diff --git a/aucma-system/src/main/resources/mapper/system/SysConfigMapper.xml b/aucma-system/src/main/resources/mapper/system/SysConfigMapper.xml
index bee2691..9ac1d4e 100644
--- a/aucma-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -18,7 +18,7 @@
select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
- from sys_config
+ from Z_sys_config
@@ -73,7 +73,7 @@
SELECT seq_sys_config.NEXTVAL as configId FROM DUAL
- insert into sys_config (
+ insert into Z_sys_config (
config_id,config_name,config_key,
@@ -95,7 +95,7 @@
- update sys_config
+ update Z_sys_config
config_name = #{configName},config_key = #{configKey},
@@ -109,11 +109,11 @@
- delete from sys_config where config_id = #{configId}
+ delete from Z_sys_config where config_id = #{configId}
- delete from sys_config where config_id in
+ delete from Z_sys_config where config_id in
#{configId}
diff --git a/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml b/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 3eac49e..0df5a93 100644
--- a/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -24,7 +24,7 @@
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
- from sys_dept d
+ from Z_sys_dept d
- select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+ select count(1) from Z_sys_user where dept_id = #{deptId} and del_flag = '0'
- select count(1) from sys_dept
+ select count(1) from Z_sys_dept
where del_flag = '0' and parent_id = #{deptId} and rownum 1
- select * from sys_dept where FIND_IN_SET(#{deptId}, ancestors) ]]> 0
+ select * from Z_sys_dept where FIND_IN_SET(#{deptId}, ancestors) ]]> 0
- select count(*) from sys_dept where status = 0 and del_flag = '0' and FIND_IN_SET(#{deptId}, ancestors) ]]> 0
+ select count(*) from Z_sys_dept where status = 0 and del_flag = '0' and FIND_IN_SET(#{deptId}, ancestors) ]]> 0
@@ -89,7 +89,7 @@
select seq_sys_dept.nextval as deptId from DUAL
- insert into sys_dept(
+ insert into Z_SYS_dept(
dept_id,parent_id,dept_name,
@@ -117,7 +117,7 @@
- update sys_dept
+ update Z_SYS_dept
parent_id = #{parentId},dept_name = #{deptName},
@@ -134,7 +134,7 @@
- update sys_dept set ancestors =
+ update Z_SYS_dept set ancestors =
when #{item.deptId} then #{item.ancestors}
@@ -147,11 +147,11 @@
- update sys_dept set del_flag = '2' where dept_id = #{deptId}
+ update Z_SYS_dept set del_flag = '2' where dept_id = #{deptId}
- update sys_dept set status = '0' where dept_id in
+ update Z_SYS_dept set status = '0' where dept_id in
#{deptId}
diff --git a/aucma-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/aucma-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 4a8f5eb..f4cf0aa 100644
--- a/aucma-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -22,7 +22,7 @@
select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
- from sys_dict_data
+ from Z_sys_dict_data
@@ -47,7 +47,7 @@
- select dict_label from sys_dict_data
+ select dict_label from Z_sys_dict_data
where dict_type = #{dictType} and dict_value = #{dictValue}
@@ -57,22 +57,22 @@
- select count(1) from sys_dict_data where dict_type=#{dictType}
+ select count(1) from Z_sys_dict_data where dict_type=#{dictType}
- delete from sys_dict_data where dict_code = #{dictCode}
+ delete from Z_sys_dict_data where dict_code = #{dictCode}
- delete from sys_dict_data where dict_code in
+ delete from Z_sys_dict_data where dict_code in
#{dictCode}
- update sys_dict_data
+ update Z_sys_dict_data
dict_sort = #{dictSort},dict_label = #{dictLabel},
@@ -90,14 +90,14 @@
- update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
+ update Z_sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
SELECT seq_sys_dict_data.NEXTVAL as dictCode FROM DUAL
- insert into sys_dict_data(
+ insert into Z_sys_dict_data(
dict_code,dict_sort,dict_label,
diff --git a/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index a637f3d..b9400ab 100644
--- a/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -17,7 +17,7 @@
select dict_id, dict_name, dict_type, status, create_by, create_time, remark
- from sys_dict_type
+ from Z_sys_dict_type
@@ -62,18 +62,18 @@
- delete from sys_dict_type where dict_id = #{dictId}
+ delete from Z_sys_dict_type where dict_id = #{dictId}
- delete from sys_dict_type where dict_id in
+ delete from Z_sys_dict_type where dict_id in
#{dictId}
- update sys_dict_type
+ update Z_sys_dict_type
dict_name = #{dictName},dict_type = #{dictType},
@@ -87,9 +87,9 @@
- SELECT seq_sys_dict_type.NEXTVAL as dictId FROM DUAL
+ SELECT seq_Z_sys_dict_type.NEXTVAL as dictId FROM DUAL
- insert into sys_dict_type(
+ insert into Z_sys_dict_type(
dict_id,dict_name,dict_type,
diff --git a/aucma-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/aucma-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index f890ce1..24e09b4 100644
--- a/aucma-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -20,12 +20,12 @@
SELECT seq_sys_logininfor.NEXTVAL as infoId FROM DUAL
- insert into sys_logininfor (info_id, user_name, status, ipaddr, login_location, browser, os, msg, login_time)
+ insert into Z_sys_logininfor (info_id, user_name, status, ipaddr, login_location, browser, os, msg, login_time)
values (#{infoId}, #{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate)
- select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
+ select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from Z_sys_logininfor
AND ipaddr like concat(concat('%',#{ipaddr}),'%')
@@ -47,14 +47,14 @@
- delete from sys_logininfor where info_id in
+ delete from Z_sys_logininfor where info_id in
#{infoId}
- truncate table sys_logininfor
+ truncate table Z_sys_logininfor
\ No newline at end of file
diff --git a/aucma-system/src/main/resources/mapper/system/SysMenuMapper.xml b/aucma-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 7c37294..d29eade 100644
--- a/aucma-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -29,7 +29,7 @@
select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, nvl(perms,'') as perms, icon, create_time
- from sys_menu
+ from Z_sys_menu
@@ -50,16 +50,16 @@
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, nvl(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+ from Z_sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, nvl(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role ro on ur.role_id = ro.role_id
+ from Z_sys_menu m
+ left join Z_sys_role_menu rm on m.menu_id = rm.menu_id
+ left join Z_sys_user_role ur on rm.role_id = ur.role_id
+ left join Z_sys_role ro on ur.role_id = ro.role_id
where ur.user_id = #{params.userId}
AND m.menu_name like concat(concat('%', #{menuName}), '%')
@@ -75,46 +75,46 @@
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, nvl(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role ro on ur.role_id = ro.role_id
- left join sys_user u on ur.user_id = u.user_id
+ from Z_sys_menu m
+ left join Z_sys_role_menu rm on m.menu_id = rm.menu_id
+ left join Z_sys_user_role ur on rm.role_id = ur.role_id
+ left join Z_sys_role ro on ur.role_id = ro.role_id
+ left join Z_SYS_user u on ur.user_id = u.user_id
where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
order by m.parent_id, m.order_num
select m.menu_id
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
+ from Z_sys_menu m
+ left join Z_SYS_role_menu rm on m.menu_id = rm.menu_id
where rm.role_id = #{roleId}
- and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+ and m.menu_id not in (select m.parent_id from Z_sys_menu m inner join Z_SYS_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
order by m.parent_id, m.order_num
select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
+ from Z_sys_menu m
+ left join Z_SYS_role_menu rm on m.menu_id = rm.menu_id
+ left join Z_SYS_user_role ur on rm.role_id = ur.role_id
select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role r on r.role_id = ur.role_id
+ from Z_sys_menu m
+ left join Z_SYS_role_menu rm on m.menu_id = rm.menu_id
+ left join Z_SYS_user_role ur on rm.role_id = ur.role_id
+ left join Z_SYS_role r on r.role_id = ur.role_id
where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
+ from Z_sys_menu m
+ left join Z_SYS_role_menu rm on m.menu_id = rm.menu_id
where m.status = '0' and rm.role_id = #{roleId}
@@ -124,7 +124,7 @@
- select count(1) from sys_menu where parent_id = #{menuId}
+ select count(1) from Z_sys_menu where parent_id = #{menuId}
@@ -133,7 +133,7 @@
- update sys_menu
+ update Z_SYS_menu
menu_name = #{menuName},parent_id = #{parentId},
@@ -159,7 +159,7 @@
select seq_sys_menu.nextval as menuId from DUAL
- insert into sys_menu(
+ insert into Z_SYS_menu(
menu_id,parent_id,menu_name,
@@ -199,7 +199,7 @@
- delete from sys_menu where menu_id = #{menuId}
+ delete from Z_sys_menu where menu_id = #{menuId}
\ No newline at end of file
diff --git a/aucma-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/aucma-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index 4bec3ed..b5265ce 100644
--- a/aucma-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -19,7 +19,7 @@
select notice_id, notice_title, notice_type, notice_content as notice_content, status, create_by, create_time, update_by, update_time, remark
- from sys_notice
+ from Z_sys_notice
@@ -46,7 +46,7 @@
select seq_sys_notice.nextval as noticeId from DUAL
- insert into sys_notice (
+ insert into Z_sys_notice (
notice_id, notice_title, notice_type,
@@ -68,7 +68,7 @@
- update sys_notice
+ update Z_sys_notice
notice_title = #{noticeTitle}, notice_type = #{noticeType},
@@ -81,11 +81,11 @@
- delete from sys_notice where notice_id = #{noticeId}
+ delete from Z_sys_notice where notice_id = #{noticeId}
- delete from sys_notice where notice_id in
+ delete from Z_sys_notice where notice_id in
#{noticeId}
diff --git a/aucma-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/aucma-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index 48f6e10..f7c9de7 100644
--- a/aucma-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -26,14 +26,14 @@
select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time
- from sys_oper_log
+ from Z_sys_oper_log
- SELECT seq_sys_oper_log.NEXTVAL as operId FROM DUAL
+ SELECT seq_Z_sys_oper_log.NEXTVAL as operId FROM DUAL
- insert into sys_oper_log(
+ insert into Z_sys_oper_log(
oper_id,title,business_type,
@@ -104,7 +104,7 @@
- delete from sys_oper_log where oper_id in
+ delete from Z_sys_oper_log where oper_id in
#{operId}
@@ -116,7 +116,7 @@
- truncate table sys_oper_log
+ truncate table Z_sys_oper_log
\ No newline at end of file
diff --git a/aucma-system/src/main/resources/mapper/system/SysPortLogMapper.xml b/aucma-system/src/main/resources/mapper/system/SysPortLogMapper.xml
index f78825e..4ae862f 100644
--- a/aucma-system/src/main/resources/mapper/system/SysPortLogMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysPortLogMapper.xml
@@ -20,7 +20,7 @@
select obj_id, factory_code, log_title, log_method, operation_param,
- result_one, result_two, result_three, error_msg, operation_user, operation_time from sys_port_log
+ result_one, result_two, result_three, error_msg, operation_user, operation_time from Z_sys_port_log
@@ -50,7 +50,7 @@
SELECT seq_sys_port_log.NEXTVAL as objId FROM DUAL
- insert into sys_port_log
+ insert into Z_sys_port_log
obj_id,factory_code,
@@ -80,7 +80,7 @@
- update sys_port_log
+ update Z_sys_port_log
factory_code = #{factoryCode},log_title = #{logTitle},
@@ -97,11 +97,11 @@
- delete from sys_port_log where obj_id = #{objId}
+ delete from Z_sys_port_log where obj_id = #{objId}
- delete from sys_port_log where obj_id in
+ delete from Z_sys_port_log where obj_id in
#{objId}
diff --git a/aucma-system/src/main/resources/mapper/system/SysPostMapper.xml b/aucma-system/src/main/resources/mapper/system/SysPostMapper.xml
index af099ac..b4c7ec3 100644
--- a/aucma-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -19,7 +19,7 @@
select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark
- from sys_post
+ from Z_sys_post
@@ -49,17 +49,17 @@
select p.post_id
- from sys_post p
- left join sys_user_post up on up.post_id = p.post_id
- left join sys_user u on u.user_id = up.user_id
+ from Z_sys_post p
+ left join Z_sys_user_post up on up.post_id = p.post_id
+ left join Z_sys_user u on u.user_id = up.user_id
where u.user_id = #{userId}
select p.post_id, p.post_name, p.post_code
- from sys_post p
- left join sys_user_post up on up.post_id = p.post_id
- left join sys_user u on u.user_id = up.user_id
+ from Z_sys_post p
+ left join Z_sys_user_post up on up.post_id = p.post_id
+ left join Z_sys_user u on u.user_id = up.user_id
where u.user_name = #{userName}
@@ -74,7 +74,7 @@
- update sys_post
+ update Z_sys_post
post_code = #{postCode},post_name = #{postName},
@@ -91,7 +91,7 @@
select seq_sys_post.nextval as postId from DUAL
- insert into sys_post(
+ insert into Z_sys_post(
post_id,post_code,post_name,
@@ -113,11 +113,11 @@
- delete from sys_post where post_id = #{postId}
+ delete from Z_sys_post where post_id = #{postId}
- delete from sys_post where post_id in
+ delete from Z_sys_post where post_id in
#{postId}
diff --git a/aucma-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/aucma-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index 760b253..1d44121 100644
--- a/aucma-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -10,15 +10,15 @@
- delete from sys_role_dept where role_id=#{roleId}
+ delete from Z_sys_role_dept where role_id=#{roleId}
- select count(1) from sys_role_dept where dept_id=#{deptId}
+ select count(1) from Z_sys_role_dept where dept_id=#{deptId}
- delete from sys_role_dept where role_id in
+ delete from Z_sys_role_dept where role_id in
#{roleId}
@@ -27,7 +27,7 @@
insert all
- into sys_role_dept(role_id, dept_id) values (#{item.roleId},#{item.deptId})
+ into Z_sys_role_dept(role_id, dept_id) values (#{item.roleId},#{item.deptId})
SELECT 1 FROM DUAL
diff --git a/aucma-system/src/main/resources/mapper/system/SysRoleMapper.xml b/aucma-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 6d0327b..6bce2e0 100644
--- a/aucma-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -24,10 +24,10 @@
select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
r.status, r.del_flag, r.create_time, r.remark
- from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
- left join sys_dept d on u.dept_id = d.dept_id
+ from Z_sys_role r
+ left join Z_sys_user_role ur on ur.role_id = r.role_id
+ left join Z_sys_user u on u.user_id = ur.user_id
+ left join Z_sys_dept d on u.dept_id = d.dept_id
@@ -67,9 +67,9 @@
select r.role_id
- from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
+ from Z_sys_role r
+ left join Z_sys_user_role ur on ur.role_id = r.role_id
+ left join Z_sys_user u on u.user_id = ur.user_id
where u.user_id = #{userId}
@@ -97,7 +97,7 @@
select seq_sys_role.nextval as roleId from DUAL
- insert into sys_role(
+ insert into Z_SYS_role(
role_id,role_name,role_key,
@@ -125,7 +125,7 @@
- update sys_role
+ update Z_SYS_role
role_name = #{roleName},role_key = #{roleKey},
@@ -142,11 +142,11 @@
- update sys_role set del_flag = '2' where role_id = #{roleId}
+ update Z_SYS_role set del_flag = '2' where role_id = #{roleId}
- update sys_role set del_flag = '2' where role_id in
+ update Z_SYS_role set del_flag = '2' where role_id in
#{roleId}
diff --git a/aucma-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/aucma-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index f152fd9..5339455 100644
--- a/aucma-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -10,15 +10,15 @@
- select count(1) from sys_role_menu where menu_id = #{menuId}
+ select count(1) from Z_sys_role_menu where menu_id = #{menuId}
- delete from sys_role_menu where role_id=#{roleId}
+ delete from Z_sys_role_menu where role_id=#{roleId}
- delete from sys_role_menu where role_id in
+ delete from Z_sys_role_menu where role_id in
#{roleId}
@@ -27,7 +27,7 @@
insert all
- into sys_role_menu(role_id, menu_id) values (#{item.roleId},#{item.menuId})
+ into Z_sys_role_menu(role_id, menu_id) values (#{item.roleId},#{item.menuId})
SELECT 1 FROM DUAL
diff --git a/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml b/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml
index 407e9b0..579b3f4 100644
--- a/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -84,10 +84,10 @@
u.team_code,
tm.team_name,
pl.PRODUCT_LINE_NAME station_name
- from sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
+ from Z_sys_user u
+ left join Z_sys_dept d on u.dept_id = d.dept_id
+ left join Z_sys_user_role ur on u.user_id = ur.user_id
+ left join Z_sys_role r on r.role_id = ur.role_id
left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = u.station_code
left join BASE_TEAMMEMBERS tm on tm.TEAM_CODE = u.TEAM_CODE
@@ -114,8 +114,8 @@
u.team_code,
tm.team_name,
pl.PRODUCT_LINE_NAME station_name
- from sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
+ from Z_sys_user u
+ left join Z_SYS_dept d on u.dept_id = d.dept_id
left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = u.station_code
left join BASE_TEAMMEMBERS tm on tm.TEAM_CODE = u.TEAM_CODE
where u.del_flag = '0'
@@ -138,7 +138,7 @@
AND to_char(u.create_time, 'yyyy-mm-dd') <= #{params.endTime}
- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId}, ancestors) ]]> 0 ))
+ AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id from Z_sys_dept t WHERE FIND_IN_SET(#{deptId}, ancestors) ]]> 0 ))
${params.dataScope}
@@ -147,10 +147,10 @@
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
+ from Z_sys_user u
+ left join Z_SYS_dept d on u.dept_id = d.dept_id
+ left join Z_SYS_user_role ur on u.user_id = ur.user_id
+ left join Z_SYS_role r on r.role_id = ur.role_id
where u.del_flag = '0' and r.role_id = #{roleId}
AND u.user_name like concat(concat('%',#{userName}),'%')
@@ -164,12 +164,12 @@
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
+ from Z_sys_user u
+ left join Z_SYS_dept d on u.dept_id = d.dept_id
+ left join Z_SYS_user_role ur on u.user_id = ur.user_id
+ left join Z_SYS_role r on r.role_id = ur.role_id
where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
- and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
+ and u.user_id not in (select u.user_id from Z_sys_user u inner join Z_SYS_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
AND u.user_name like concat(concat('%',#{userName}),'%')
@@ -191,22 +191,22 @@
- select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' and rownum 1
+ select user_id, user_name from Z_sys_user where user_name = #{userName} and del_flag = '0' and rownum 1
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' and rownum 1
+ select user_id, phonenumber from Z_sys_user where phonenumber = #{phonenumber} and del_flag = '0' and rownum 1
- select user_id, email from sys_user where email = #{email} and del_flag = '0' and rownum 1
+ select user_id, email from Z_sys_user where email = #{email} and del_flag = '0' and rownum 1
select seq_sys_user.nextval as userId from DUAL
- insert into sys_user(
+ insert into Z_SYS_user(
user_id,dept_id,user_name,
@@ -244,7 +244,7 @@
- update sys_user
+ update Z_SYS_user
dept_id = #{deptId},user_name = #{userName},
@@ -268,23 +268,23 @@
- update sys_user set status = #{status} where user_id = #{userId}
+ update Z_SYS_user set status = #{status} where user_id = #{userId}
- update sys_user set avatar = #{avatar} where user_name = #{userName}
+ update Z_SYS_user set avatar = #{avatar} where user_name = #{userName}
- update sys_user set password = #{password} where user_name = #{userName}
+ update Z_SYS_user set password = #{password} where user_name = #{userName}
- update sys_user set del_flag = '2' where user_id = #{userId}
+ update Z_SYS_user set del_flag = '2' where user_id = #{userId}
- update sys_user set del_flag = '2' where user_id in
+ update Z_SYS_user set del_flag = '2' where user_id in
#{userId}
diff --git a/aucma-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/aucma-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index bd2e2f8..271dcad 100644
--- a/aucma-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -10,15 +10,15 @@
- delete from sys_user_post where user_id=#{userId}
+ delete from Z_sys_user_post where user_id=#{userId}
- select count(1) from sys_user_post where post_id=#{postId}
+ select count(1) from Z_sys_user_post where post_id=#{postId}
- delete from sys_user_post where user_id in
+ delete from Z_sys_user_post where user_id in
#{userId}
@@ -27,7 +27,7 @@
insert all
- into sys_user_post(user_id, post_id) values (#{item.userId},#{item.postId})
+ into Z_sys_user_post(user_id, post_id) values (#{item.userId},#{item.postId})
SELECT 1 FROM DUAL
diff --git a/aucma-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/aucma-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index f906099..850f849 100644
--- a/aucma-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/aucma-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -10,15 +10,15 @@
- delete from sys_user_role where user_id=#{userId}
+ delete from Z_sys_user_role where user_id=#{userId}
- select count(1) from sys_user_role where role_id=#{roleId}
+ select count(1) from Z_sys_user_role where role_id=#{roleId}
- delete from sys_user_role where user_id in
+ delete from Z_sys_user_role where user_id in
#{userId}
@@ -27,17 +27,17 @@
insert all
- into sys_user_role(user_id, role_id) values (#{item.userId},#{item.roleId})
+ into Z_sys_user_role(user_id, role_id) values (#{item.userId},#{item.roleId})
SELECT 1 FROM DUAL
- delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
+ delete from Z_sys_user_role where user_id=#{userId} and role_id=#{roleId}
- delete from sys_user_role where role_id=#{roleId} and user_id in
+ delete from Z_sys_user_role where role_id=#{roleId} and user_id in
#{userId}