diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue index 6aa56c9aa..1ad125fc7 100644 --- a/fuintAdmin_zt/src/views/Site/add.vue +++ b/fuintAdmin_zt/src/views/Site/add.vue @@ -31,6 +31,9 @@ export default { roleCode: [ {required: true, message: '请选择登录权限', trigger: 'change'} ], + menuIds: [ + {required: true, message: '请选择菜单信息', trigger: 'change'} + ], }, dutyId:'', tableData: [], @@ -305,8 +308,9 @@ export default { + - + @@ -339,11 +343,11 @@ export default { - + - + @@ -352,11 +356,11 @@ export default { - + 全选 展开 - + @@ -400,6 +404,7 @@ export default { + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml index e9c2327de..e4a1d6499 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/mapper/xml/LjStoreMapper.xml @@ -3,9 +3,14 @@ SELECT ms.*,sd.dept_name,sd.leader_name,sd.leader_phone,sd.turnover_type,sd.turnover_limit, - sd.turnover_start_time,sd.turnover_end_time,sd.rates,sd.prepaid_amount,sd.create_time deptCreateTime,sd.store_num + sd.turnover_start_time,sd.turnover_end_time,sd.rates,sd.prepaid_amount,sd.deptCreateTime,sd.store_num FROM mt_store ms - LEFT JOIN sys_dept sd ON ms.contract_dept_id = sd.dept_id + LEFT JOIN ( + SELECT sd1.dept_name,sd1.leader_name,sd1.leader_phone,sd2.turnover_type,sd2.turnover_limit, + sd2.turnover_start_time,sd2.turnover_end_time,sd2.rates,sd2.prepaid_amount,sd1.create_time deptCreateTime, + sd2.store_num,sd1.if_delete,sd1.dept_id,sd1.ancestors + FROM sys_dept sd1 LEFT JOIN sys_dept sd2 on sd1.parent_id = sd2.dept_id + ) sd ON ms.contract_dept_id = sd.dept_id sd.if_delete = 0 and ms.if_delete = 0