From ffaf9d938ab2b710eca8136c8f8fa56ea88cb347 Mon Sep 17 00:00:00 2001 From: jiang Date: Mon, 5 Jan 2026 09:32:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DevMergeServiceImpl.java | 2 + .../material/basic/BmCompanyAddressMapper.xml | 6 +- .../mapper/material/device/DevInfoMapper.xml | 6 +- .../mapper/material/device/DevMergeMapper.xml | 4 +- .../material/equipment/SysDeptMapper.xml | 2 +- .../mapper/material/home/MaTypeInfoMapper.xml | 4 +- .../mapper/material/index/IndexMapper.xml | 132 +++++++++++------- .../lease/LeaseRepairRecordMapper.xml | 6 +- .../material/lease/MaLeaseInfoMapper.xml | 28 ++-- .../material/toolLedger/ToolLedgerMapper.xml | 2 +- 10 files changed, 115 insertions(+), 77 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java index 0ac370c..7996f5d 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevMergeServiceImpl.java @@ -243,8 +243,10 @@ public class DevMergeServiceImpl implements DevMergeService { public AjaxResult interDevice(MaDevInfo maDevInfo) { try { Long thisLoginUserDeptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + String province = SecurityUtils.getLoginUser().getSysUser().getDept().getProvince(); maDevInfo.setPropertyUnitId(Math.toIntExact(thisLoginUserDeptId)); maDevInfo.setCode(getString()); + maDevInfo.setProvince(province); Integer i = devMergeMapper.interDevice(maDevInfo); if (i > 0) { devInfoMapper.deleteDevInfoProperties(Long.valueOf(maDevInfo.getMaId())); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml index 9d4fc06..a8bbcd8 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml @@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select bca.id, bca.company_id, bca.province_code, bca.city_code, bca.area_code, bca.address, bca.create_time, bca.update_time, b.name as area_name, b1.name as province_name, b2.name as city_name from bm_company_address bca - LEFT JOIN base_address b ON b.code = bca.area_code - LEFT JOIN base_address b1 on bca.province_code = b1.code - LEFT JOIN base_address b2 on bca.city_code = b2.code + LEFT JOIN sys_cnarea b ON b.area_code = bca.area_code + LEFT JOIN sys_cnarea b1 on bca.province_code = b1.area_code + LEFT JOIN sys_cnarea b2 on bca.city_code = b2.area_code select name - from base_address where code = #{city} + from sys_cnarea where area_code = #{city} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml index 3485830..e9095d5 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml @@ -82,10 +82,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml index 3b6f570..8e53139 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml @@ -183,6 +183,16 @@ and cds.create_time between #{startTime} and #{endTime} + + and cds.company_id + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) + GROUP BY cds.id, cds.change_status, @@ -567,8 +577,15 @@ and cd.pro_code = #{proCode} - - and cd.company_id = #{companyId} + + and cd.company_id + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) GROUP BY cd.id @@ -719,8 +736,18 @@ AND temp.taskStatus = #{taskStatus} - - AND temp.companyId = #{companyId} + + + + + AND temp.companyId + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) @@ -1281,4 +1308,4 @@ update cs_device_change set del_flag = '1' where id = #{id} - \ No newline at end of file + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml index a7f44c7..8adc868 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml @@ -360,8 +360,15 @@ LEFT JOIN sys_cnarea sc ON sc.area_code = mdi.province_id mdi.is_active = '1' and mdi.entry_status = '1' - - AND mdi.on_company = #{companyId} + + AND mdi.on_company + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) and ( @@ -527,8 +534,15 @@ LEFT JOIN sys_cnarea sc ON sc.area_code = mdi.province_id mdi.is_active = '1' and mdi.entry_status = '1' - - AND mdi.on_company = #{companyId} + + AND mdi.on_company + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml index 5804bce..99cb47a 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevRetireWarningMapper.xml @@ -63,8 +63,15 @@ AND mdi.supplier_id like concat('%',#{manufacturerId},'%') - - AND mdi.on_company = #{companyId} + + AND mdi.on_company + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) ) a diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index 8f641e3..9a9ef6b 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -109,8 +109,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(m1.create_time,'%Y-%m-%d') between #{createStartTime} and #{createEndTime} - - and m2.on_company = #{qcCom} + + and m2.on_company + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml index bb1581f..ed9fb25 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -287,8 +287,16 @@ AND cdc.review_status = #{status} - - and cdc.company_id = #{companyId} + + and cdc.company_id + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) + and cdc.review_status !='5' @@ -448,4 +456,4 @@ id = #{id} LIMIT 1 - \ No newline at end of file + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/scrap/ScrapMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/scrap/ScrapMapper.xml index 5630e6a..e554e81 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/scrap/ScrapMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/scrap/ScrapMapper.xml @@ -144,8 +144,15 @@ AND cdc.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') - - and cdc.company_id = #{companyId} + + and cdc.company_id + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) GROUP BY cdc.id ORDER BY @@ -449,4 +456,4 @@ update cs_device_change set del_flag = '1' where id = #{id} - \ No newline at end of file + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml index 486d5ed..fa460d4 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/toolLedger/ToolLedgerMapper.xml @@ -104,8 +104,14 @@ AND tt.manage_type = #{manageMode} - - AND tl.company_id = #{companyId} + + AND tl.company_id in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) AND tt.type_name LIKE CONCAT('%', #{typeName}, '%') @@ -228,8 +234,15 @@ AND tl.tool_code LIKE CONCAT('%', #{toolCode}, '%') - - AND (tl.company_id = #{companyId} OR tl.company_id IS NULL) + + + and tl.company_id in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) ORDER BY tl.create_time DESC diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownEquipmentMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownEquipmentMapper.xml index bdd2517..5303399 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownEquipmentMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownEquipmentMapper.xml @@ -198,8 +198,16 @@ and mtv.childGx like concat('%', #{subProcess}, '%') - - and mdi.on_company = #{companyId} + + and mdi.on_company + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownToolMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownToolMapper.xml index fcdfc02..93878e0 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownToolMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/upOrDown/UpOrDownToolMapper.xml @@ -89,7 +89,14 @@ AND tt.type_name LIKE CONCAT('%', #{typeName}, '%') - AND tl.company_id = #{companyId} + AND tl.company_id + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) GROUP BY tl.id diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/warehousing/WarehousingMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/warehousing/WarehousingMapper.xml index fceed1c..3aba98d 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/warehousing/WarehousingMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/warehousing/WarehousingMapper.xml @@ -153,8 +153,15 @@ AND bw.status != #{isStatus} - - AND su.dept_id = #{companyId} + + AND su.dept_id + in ( + select dept_id from sys_dept where dept_id= #{companyId} + union + select dept_id from sys_dept where parent_id= #{companyId} + union + select dept_id from sys_dept where parent_id in (select dept_id from sys_dept where parent_id= #{companyId}) + ) and bw.create_time >= #{startTime} @@ -221,4 +228,4 @@ - \ No newline at end of file + From fe233dba7c4fba84447b2c0e32b45cf157ac4f07 Mon Sep 17 00:00:00 2001 From: jiang Date: Mon, 5 Jan 2026 13:46:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/material/index/IndexMapper.xml | 111 +++++++++--------- 1 file changed, 56 insertions(+), 55 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml index ccb76a7..33eb69e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/index/IndexMapper.xml @@ -249,68 +249,69 @@