From 9197dc4ae02a71678adc8437967c0395a97dedc8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 09 四月 2026 15:34:46 +0800
Subject: [PATCH] yys 1.开发数据权限过滤切面 2.开发数据权限过滤插件 3.全局增加数据过滤字段
---
src/main/java/com/ruoyi/stock/pojo/StockInventory.java | 7
src/main/java/com/ruoyi/basic/pojo/Customer.java | 7
src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java | 3
src/main/java/com/ruoyi/safe/pojo/SafeAccident.java | 3
src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java | 3
src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java | 8
src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java | 3
src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java | 3
src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java | 3
src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java | 3
src/main/java/com/ruoyi/framework/security/service/TokenService.java | 75 +++
src/main/java/com/ruoyi/projectManagement/pojo/ShippingAddress.java | 3
src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java | 9
src/main/java/com/ruoyi/staff/pojo/Bank.java | 9
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 7
src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java | 3
src/main/java/com/ruoyi/approve/pojo/FileSharing.java | 3
src/main/java/com/ruoyi/approve/pojo/HolidaySettings.java | 3
src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java | 3
src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java | 3
src/main/java/com/ruoyi/safe/pojo/SafeHazard.java | 3
src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java | 3
src/main/resources/application-dev.yml | 4
src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java | 3
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 3
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 3
src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java | 3
src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java | 3
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 7
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java | 8
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 3
src/main/java/com/ruoyi/projectManagement/pojo/Plan.java | 3
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffLeave.java | 7
src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java | 9
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java | 7
src/main/java/com/ruoyi/projectManagement/pojo/Roles.java | 3
src/main/java/com/ruoyi/approve/pojo/AnnualLeaveSetting.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java | 3
src/main/java/com/ruoyi/production/pojo/SalesLedgerWork.java | 3
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 7
src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingMinutes.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffEducation.java | 3
src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java | 3
src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java | 7
src/main/java/com/ruoyi/account/pojo/BorrowInfo.java | 3
src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java | 4
src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java | 3
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java | 3
src/main/java/com/ruoyi/projectManagement/pojo/ContractInfo.java | 3
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java | 5
src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java | 3
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java | 5
src/main/java/com/ruoyi/staff/pojo/StaffContract.java | 7
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 4
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 8
src/main/java/com/ruoyi/production/pojo/ProductBom.java | 3
src/main/java/com/ruoyi/other/pojo/TempFile.java | 10
src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java | 7
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 3
src/main/java/com/ruoyi/warehouse/pojo/Documentation.java | 3
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java | 3
src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java | 3
src/main/java/com/ruoyi/approve/pojo/NotificationManagement.java | 3
src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java | 3
src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java | 3
src/main/java/com/ruoyi/safe/pojo/SafeHidden.java | 3
src/main/java/com/ruoyi/staff/pojo/PersonalShift.java | 7
src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java | 3
src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java | 7
src/main/java/com/ruoyi/projectManagement/pojo/PlanNode.java | 3
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 3
src/main/java/com/ruoyi/oA/pojo/OaProject.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/GasTankWarning.java | 3
src/main/java/com/ruoyi/other/pojo/PdaVersion.java | 3
src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java | 3
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 3
src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java | 3
src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java | 3
src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java | 3
src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java | 7
src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java | 3
src/main/java/com/ruoyi/account/pojo/AccountFile.java | 3
src/main/java/com/ruoyi/basic/pojo/Product.java | 10
src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java | 3
src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java | 3
src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java | 11
src/main/java/com/ruoyi/sales/pojo/Loss.java | 7
src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java | 7
src/main/java/com/ruoyi/projectManagement/pojo/Info.java | 3
src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java | 3
src/main/java/com/ruoyi/stock/pojo/StockUninventory.java | 7
src/main/java/com/ruoyi/account/pojo/AccountIncome.java | 3
src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java | 7
src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java | 7
src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java | 8
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java | 3
src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java | 3
src/main/java/com/ruoyi/production/pojo/ProductStructure.java | 8
src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java | 3
src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java | 3
src/main/java/com/ruoyi/basic/pojo/StorageBlob.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java | 8
src/main/java/com/ruoyi/production/pojo/ProcessRoute.java | 7
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java | 3
src/main/java/com/ruoyi/approve/pojo/OvertimeSetting.java | 3
src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java | 8
src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java | 3
src/main/java/com/ruoyi/basic/pojo/CustomerFollowUpFile.java | 5
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 7
src/main/java/com/ruoyi/common/aop/DataScopeAop.java | 158 +++++++
src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java | 3
src/main/resources/mybatis/mybatis-config.xml | 3
src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java | 3
src/main/java/com/ruoyi/approve/pojo/ApproveLog.java | 10
src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java | 3
src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java | 7
src/main/java/com/ruoyi/common/config/MybatisHandler.java | 4
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 3
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java | 3
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 3
src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java | 2
src/main/java/com/ruoyi/production/pojo/ProductOrder.java | 7
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 4
src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java | 10
src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java | 3
src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java | 3
src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java | 5
src/main/java/com/ruoyi/safe/pojo/SafeTraining.java | 3
src/main/java/com/ruoyi/sales/pojo/CommonFile.java | 8
src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java | 3
src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java | 3
src/main/java/com/ruoyi/framework/security/LoginUser.java | 20
src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java | 3
src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java | 3
src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java | 7
src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java | 3
src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java | 3
src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java | 8
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java | 3
src/main/java/com/ruoyi/account/pojo/AccountExpense.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java | 3
src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java | 3
src/main/java/com/ruoyi/approve/pojo/OnlineMeeting.java | 3
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 7
src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml | 13
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 3
src/main/java/com/ruoyi/oA/pojo/OaProjectPhaseTask.java | 3
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java | 3
src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java | 3
src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java | 3
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 7
src/main/java/com/ruoyi/approve/pojo/ApproveNode.java | 3
src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java | 8
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 7
src/main/java/com/ruoyi/device/pojo/DeviceLedger.java | 3
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 7
src/main/java/com/ruoyi/stock/pojo/StockInRecord.java | 3
src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 3
src/main/java/com/ruoyi/production/pojo/SpeculativeTradingInfo.java | 3
src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java | 3
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 3
src/main/java/com/ruoyi/projectManagement/pojo/InfoStage.java | 4
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 3
src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java | 8
src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java | 8
src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java | 7
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java | 1
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 3
src/main/java/com/ruoyi/oA/pojo/OaProjectPhase.java | 3
src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java | 3
src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java | 3
src/main/java/com/ruoyi/safe/pojo/SafeCertification.java | 3
src/main/java/com/ruoyi/common/interceptor/DataScopeSqlInterceptor.java | 257 +++++++++++
src/main/java/com/ruoyi/approve/pojo/WorkingHoursSetting.java | 3
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java | 3
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java | 7
src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java | 3
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 3
186 files changed, 1,288 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
index cbb6eed..9eb5863 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
@@ -126,4 +126,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountFile.java b/src/main/java/com/ruoyi/account/pojo/AccountFile.java
index 4dad77d..7c4d353 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountFile.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountFile.java
@@ -64,4 +64,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
index fee01ad..7f5e317 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
@@ -126,4 +126,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java b/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
index 889cc4f..280c3f3 100644
--- a/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
+++ b/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
@@ -90,4 +90,7 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java b/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
index f05f9ed..46eb5cf 100644
--- a/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
+++ b/src/main/java/com/ruoyi/account/pojo/SalesReceiptReturn.java
@@ -68,4 +68,7 @@
@ApiModelProperty("鍒涘缓鑰�")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java b/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
index 08cb451..2541da2 100644
--- a/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
+++ b/src/main/java/com/ruoyi/account/pojo/SalesRefundAmountOrder.java
@@ -67,4 +67,11 @@
@ApiModelProperty("鏇存柊浜篿d")
private Long updateUserId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
index d29666d..0937b5b 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
@@ -1,5 +1,7 @@
package com.ruoyi.aftersalesservice.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -88,4 +90,7 @@
@ApiModelProperty("绉熸埛id")
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
index e11722e..2c767fb 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesService.java
@@ -160,4 +160,7 @@
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java
index 5dcae01..d2c243b 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesServiceFile.java
@@ -1,5 +1,7 @@
package com.ruoyi.aftersalesservice.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -59,4 +61,7 @@
@ApiModelProperty("绉熸埛id")
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/approve/pojo/AnnualLeaveSetting.java b/src/main/java/com/ruoyi/approve/pojo/AnnualLeaveSetting.java
index 2097b30..61d551e 100644
--- a/src/main/java/com/ruoyi/approve/pojo/AnnualLeaveSetting.java
+++ b/src/main/java/com/ruoyi/approve/pojo/AnnualLeaveSetting.java
@@ -67,4 +67,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java b/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java
index 8952e0d..6ea4aa4 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveLog.java
@@ -1,5 +1,8 @@
package com.ruoyi.approve.pojo;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -54,4 +57,11 @@
*/
private String approveRemark;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index 2ea7dd5..09e3f02 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -128,4 +128,7 @@
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 808199f..11d5268 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -171,4 +171,11 @@
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/FileSharing.java b/src/main/java/com/ruoyi/approve/pojo/FileSharing.java
index 9c84034..169df73 100644
--- a/src/main/java/com/ruoyi/approve/pojo/FileSharing.java
+++ b/src/main/java/com/ruoyi/approve/pojo/FileSharing.java
@@ -66,4 +66,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/HolidaySettings.java b/src/main/java/com/ruoyi/approve/pojo/HolidaySettings.java
index f3d9506..c4469dd 100644
--- a/src/main/java/com/ruoyi/approve/pojo/HolidaySettings.java
+++ b/src/main/java/com/ruoyi/approve/pojo/HolidaySettings.java
@@ -77,4 +77,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java b/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java
index c21eb72..c668079 100644
--- a/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java
+++ b/src/main/java/com/ruoyi/approve/pojo/KnowledgeBase.java
@@ -1,5 +1,6 @@
package com.ruoyi.approve.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -83,4 +84,11 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/NotificationManagement.java b/src/main/java/com/ruoyi/approve/pojo/NotificationManagement.java
index cb91626..960b5e3 100644
--- a/src/main/java/com/ruoyi/approve/pojo/NotificationManagement.java
+++ b/src/main/java/com/ruoyi/approve/pojo/NotificationManagement.java
@@ -85,4 +85,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/OnlineMeeting.java b/src/main/java/com/ruoyi/approve/pojo/OnlineMeeting.java
index 863d348..8a52ec3 100644
--- a/src/main/java/com/ruoyi/approve/pojo/OnlineMeeting.java
+++ b/src/main/java/com/ruoyi/approve/pojo/OnlineMeeting.java
@@ -77,4 +77,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/OvertimeSetting.java b/src/main/java/com/ruoyi/approve/pojo/OvertimeSetting.java
index ed929cd..d4cd88e 100644
--- a/src/main/java/com/ruoyi/approve/pojo/OvertimeSetting.java
+++ b/src/main/java/com/ruoyi/approve/pojo/OvertimeSetting.java
@@ -76,4 +76,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java b/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java
index d47f2a0..b6a0d8b 100644
--- a/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java
+++ b/src/main/java/com/ruoyi/approve/pojo/RpaProcessAutomation.java
@@ -62,4 +62,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/approve/pojo/WorkingHoursSetting.java b/src/main/java/com/ruoyi/approve/pojo/WorkingHoursSetting.java
index e457c8f..4e83d43 100644
--- a/src/main/java/com/ruoyi/approve/pojo/WorkingHoursSetting.java
+++ b/src/main/java/com/ruoyi/approve/pojo/WorkingHoursSetting.java
@@ -76,4 +76,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 101d72a..753d76f 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -116,4 +116,11 @@
@ApiModelProperty(value = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
index a64bf66..bd73a31 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUp.java
@@ -1,5 +1,8 @@
package com.ruoyi.basic.pojo;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -82,4 +85,11 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUpFile.java b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUpFile.java
index 2e33d08..bf89dd4 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUpFile.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerFollowUpFile.java
@@ -1,5 +1,7 @@
package com.ruoyi.basic.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -78,4 +80,7 @@
* 绉熸埛ID
*/
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java b/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java
index 9ddfc42..d91c863 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerReturnVisit.java
@@ -1,5 +1,7 @@
package com.ruoyi.basic.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -89,4 +91,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/pojo/Product.java b/src/main/java/com/ruoyi/basic/pojo/Product.java
index 6b4e14b..788be1d 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Product.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Product.java
@@ -29,4 +29,14 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(exist = false)
+ private Long[] deptIds;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 069b665..cb93426 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -63,4 +63,11 @@
@TableField(exist = false)
private LocalDateTime createTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java b/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java
index 1dd7bc7..87f1ac5 100644
--- a/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java
+++ b/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java
@@ -1,5 +1,6 @@
package com.ruoyi.basic.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.basic.dto.StorageBlobDTO;
@@ -73,4 +74,11 @@
this.recordType = recordType;
this.recordId = recordId;
}
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java b/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java
index 6bf6fc6..49a258d 100644
--- a/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java
+++ b/src/main/java/com/ruoyi/basic/pojo/StorageBlob.java
@@ -89,4 +89,7 @@
@ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index ccc2d6f..7153751 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -83,4 +83,7 @@
@ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
@TableField(value = "supplier_type")
private String supplierType;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java
index 31914fa..16a24d8 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManageFile.java
@@ -57,4 +57,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 9382134..c44ee24 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -70,6 +70,9 @@
public List<ProductModel> selectModelList(ProductDto productDto) {
LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProductModel::getProductId, productDto.getId());
+ queryWrapper.eq(productDto.getCreateUser() != null, ProductModel::getCreateUser, productDto.getCreateUser());
+ queryWrapper.eq(productDto.getDeptId() != null, ProductModel::getDeptId, productDto.getDeptId());
+ queryWrapper.in(productDto.getDeptIds() != null && productDto.getDeptIds().length > 0, ProductModel::getDeptId, Arrays.asList(productDto.getDeptIds()));
return productModelMapper.selectList(queryWrapper);
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
index 1a55190..42b759d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/DutyPlan.java
@@ -122,4 +122,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java
index 5f9ad1d..3308198 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetApplication.java
@@ -137,4 +137,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
index 7df4b0a..e8d83d9 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
@@ -129,4 +129,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingMinutes.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingMinutes.java
index bd80254..b072f87 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingMinutes.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingMinutes.java
@@ -76,4 +76,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
index 9742071..cbfb421 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
@@ -95,4 +95,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index 5ca6e4b..514ff00 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -86,4 +86,7 @@
@ApiModelProperty("澶囨敞")
private String remark;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java
index 840c338..79cdf52 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/NoticeType.java
@@ -32,4 +32,11 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java
index 1aa4892..67143c2 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java
@@ -67,4 +67,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
index cc32e10..94f2d2c 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
@@ -108,4 +108,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
index fa43d0e..9079c90 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
@@ -62,4 +62,7 @@
@ApiModelProperty("绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index 4055f21..0acac2d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -74,4 +74,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
index 967769e..18bb633 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/StaffContactsPersonal.java
@@ -40,4 +40,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/common/aop/DataScopeAop.java b/src/main/java/com/ruoyi/common/aop/DataScopeAop.java
new file mode 100644
index 0000000..f77ca63
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/aop/DataScopeAop.java
@@ -0,0 +1,158 @@
+package com.ruoyi.common.aop;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.security.LoginUser;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Map;
+
+@Aspect
+@Component
+public class DataScopeAop {
+
+ private static final String DATA_SCOPE_ALL = "1";
+ private static final String DATA_SCOPE_CUSTOM = "2";
+ private static final String DATA_SCOPE_DEPT = "3";
+ private static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+ private static final String DATA_SCOPE_SELF = "5";
+
+ @Before("@within(restController)")
+ public void fillDataScopeCondition(JoinPoint joinPoint, RestController restController) {
+ System.out.println("[DataScopeAop] enter: " + joinPoint.getSignature().toShortString());
+ fillDataScopeCondition(joinPoint);
+ }
+
+ public void fillDataScopeCondition(JoinPoint joinPoint) {
+ LoginUser loginUser;
+ try {
+ loginUser = SecurityUtils.getLoginUser();
+ } catch (Exception ignored) {
+ System.out.println("[DataScopeAop] skip: loginUser unavailable");
+ return;
+ }
+ if (loginUser == null || loginUser.getUser() == null || loginUser.getUser().isAdmin()) {
+ System.out.println("[DataScopeAop] skip: loginUser null or admin");
+ return;
+ }
+ String dataScope = loginUser.getDataScope();
+ if (dataScope == null || DATA_SCOPE_ALL.equals(dataScope)) {
+ System.out.println("[DataScopeAop] skip: dataScope=" + dataScope);
+ return;
+ }
+ for (Object arg : joinPoint.getArgs()) {
+ bindScope(arg, loginUser, dataScope);
+ }
+ }
+
+
+
+ private void bindScope(Object arg, LoginUser loginUser, String dataScope) {
+ if (arg == null || isIgnoredType(arg.getClass())) {
+ return;
+ }
+ if (arg instanceof Collection<?>) {
+ for (Object item : (Collection<?>) arg) {
+ bindScope(item, loginUser, dataScope);
+ }
+ return;
+ }
+ if (arg instanceof Map<?, ?>) {
+ for (Object value : ((Map<?, ?>) arg).values()) {
+ bindScope(value, loginUser, dataScope);
+ }
+ return;
+ }
+ if (arg.getClass().isArray()) {
+ int length = Array.getLength(arg);
+ for (int i = 0; i < length; i++) {
+ bindScope(Array.get(arg, i), loginUser, dataScope);
+ }
+ return;
+ }
+
+ if (DATA_SCOPE_SELF.equals(dataScope)) {
+ setFieldValue(arg, "createUser", Integer.class, loginUser.getUserId() == null ? null : loginUser.getUserId().intValue());
+ return;
+ }
+
+ if (DATA_SCOPE_DEPT.equals(dataScope)) {
+ setFieldValue(arg, "deptId", Long.class, resolveDeptId(loginUser));
+ return;
+ }
+
+ if (DATA_SCOPE_CUSTOM.equals(dataScope) || DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
+ Long[] deptIds = loginUser.getDeptIds();
+ setFieldValue(arg, "deptIds", Long[].class, deptIds);
+ if (deptIds != null && deptIds.length == 1) {
+ setFieldValue(arg, "deptId", Long.class, deptIds[0]);
+ }
+ }
+ }
+
+ private Long resolveDeptId(LoginUser loginUser) {
+ if (loginUser.getCurrentDeptId() != null) {
+ return loginUser.getCurrentDeptId();
+ }
+ Long[] deptIds = loginUser.getDeptIds();
+ return deptIds != null && deptIds.length > 0 ? deptIds[0] : null;
+ }
+
+ private void setFieldValue(Object target, String fieldName, Class<?> fieldType, Object value) {
+ if (value == null) {
+ return;
+ }
+ Field field = findField(target.getClass(), fieldName);
+ if (field == null || !fieldType.isAssignableFrom(field.getType())) {
+ return;
+ }
+ try {
+ field.setAccessible(true);
+ field.set(target, value);
+ System.out.println("[DataScopeAop] inject: class=" + target.getClass().getSimpleName() + ", field=" + fieldName + ", value=" + value);
+ } catch (IllegalAccessException ignored) {
+ }
+ }
+
+ private Field findField(Class<?> type, String fieldName) {
+ Class<?> current = type;
+ while (current != null && current != Object.class) {
+ try {
+ return current.getDeclaredField(fieldName);
+ } catch (NoSuchFieldException ignored) {
+ current = current.getSuperclass();
+ }
+ }
+ return null;
+ }
+
+ private boolean isIgnoredType(Class<?> type) {
+ Package targetPackage = type.getPackage();
+ String packageName = targetPackage == null ? "" : targetPackage.getName();
+ return type.isPrimitive()
+ || Number.class.isAssignableFrom(type)
+ || CharSequence.class.isAssignableFrom(type)
+ || Boolean.class == type
+ || Character.class == type
+ || type.isEnum()
+ || Page.class.isAssignableFrom(type)
+ || MultipartFile.class.isAssignableFrom(type)
+ || ServletRequest.class.isAssignableFrom(type)
+ || ServletResponse.class.isAssignableFrom(type)
+ || packageName.startsWith("java.")
+ || packageName.startsWith("javax.")
+ || packageName.startsWith("jakarta.")
+ || packageName.startsWith("org.springframework.")
+ || packageName.startsWith("com.baomidou.");
+ }
+}
diff --git a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
index 66f674a..3978947 100644
--- a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
+++ b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
@@ -34,6 +34,8 @@
IGNORE_TABLES.add("sys_user_dept");
IGNORE_TABLES.add("sys_job_log");
IGNORE_TABLES.add("gen_table");
+ IGNORE_TABLES.add("sys_notice");
+ IGNORE_TABLES.add("sys_user_client");
IGNORE_TABLES.add("gen_table_column");
}
}
diff --git a/src/main/java/com/ruoyi/common/config/MybatisHandler.java b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
index 891410f..8125a35 100644
--- a/src/main/java/com/ruoyi/common/config/MybatisHandler.java
+++ b/src/main/java/com/ruoyi/common/config/MybatisHandler.java
@@ -15,10 +15,12 @@
Integer userId = null;
Long tenantId = null;
String userName = null;
+ Long deptId = null;
try {
userId = SecurityUtils.getUserId().intValue();
tenantId = SecurityUtils.getLoginUser().getTenantId();
userName = SecurityUtils.getUsername();
+ deptId = SecurityUtils.getLoginUser().getCurrentDeptId();
} catch (Exception ignored) {
}
this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
@@ -29,7 +31,7 @@
this.strictInsertFill(metaObject, "updateUser", Long.class, userId == null ? 0 : userId.longValue());
this.strictInsertFill(metaObject, "createUserName", String.class, userName);
this.strictInsertFill(metaObject, "updateUserName", String.class, userName);
-
+ this.strictInsertFill(metaObject, "deptId", Long.class, deptId);
this.strictInsertFill(metaObject, "tenantId", Long.class, tenantId);
}
diff --git a/src/main/java/com/ruoyi/common/interceptor/DataScopeSqlInterceptor.java b/src/main/java/com/ruoyi/common/interceptor/DataScopeSqlInterceptor.java
new file mode 100644
index 0000000..0129c5a
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/interceptor/DataScopeSqlInterceptor.java
@@ -0,0 +1,257 @@
+package com.ruoyi.common.interceptor;
+
+import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import com.ruoyi.common.config.IgnoreTableConfig;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.security.LoginUser;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.SystemMetaObject;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+import org.springframework.stereotype.Component;
+
+import java.sql.SQLException;
+import java.util.Locale;
+import java.util.Set;
+
+@Component
+public class DataScopeSqlInterceptor implements InnerInterceptor {
+
+ private static final String DATA_SCOPE_ALL = "1";
+ private static final String DATA_SCOPE_CUSTOM = "2";
+ private static final String DATA_SCOPE_DEPT = "3";
+ private static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+ private static final String DATA_SCOPE_SELF = "5";
+ private static final String DATA_SCOPE_MARKER = "/*data_scope*/";
+
+ @Override
+ public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds,
+ ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
+ LoginUser loginUser;
+ try {
+ loginUser = SecurityUtils.getLoginUser();
+ } catch (Exception ignored) {
+ return;
+ }
+ if (shouldSkip(loginUser, boundSql.getSql())) {
+ return;
+ }
+ // 鑾峰彇涓昏〃
+ TableSegment tableSegment = resolveMainTable(boundSql.getSql());
+ // ====================== 銆愯〃鐧藉悕鍗曘�戠洿鎺ユ斁琛� ======================
+ if (tableSegment == null || ignoreTable(tableSegment.tableName)) {
+ return;
+ }
+ String condition = buildCondition(tableSegment.qualifier, loginUser);
+ if (condition == null) {
+ return;
+ }
+ String newSql = appendCondition(boundSql.getSql(), condition);
+ if (newSql.equals(boundSql.getSql())) {
+ return;
+ }
+ MetaObject metaObject = SystemMetaObject.forObject(boundSql);
+ metaObject.setValue("sql", newSql);
+ System.out.println("[DataScopeSqlInterceptor] rewrite: " + ms.getId());
+ System.out.println("[DataScopeSqlInterceptor] sql: " + newSql);
+ }
+
+ private boolean shouldSkip(LoginUser loginUser, String sql) {
+ if (loginUser == null || loginUser.getUser() == null || loginUser.getUser().isAdmin()) {
+ return true;
+ }
+ if (sql == null || sql.trim().isEmpty()) {
+ return true;
+ }
+ String normalizedSql = sql.toLowerCase(Locale.ROOT);
+ if (!normalizedSql.startsWith("select")) {
+ return true;
+ }
+ if (normalizedSql.contains(DATA_SCOPE_MARKER)) {
+ return true;
+ }
+ return DATA_SCOPE_ALL.equals(loginUser.getDataScope());
+ }
+
+ private boolean ignoreTable(String tableName) {
+ Set<String> ignoreTables = IgnoreTableConfig.IGNORE_TABLES;
+ return ignoreTables.contains(tableName);
+ }
+
+ private String buildCondition(String qualifier, LoginUser loginUser) {
+ String prefix = qualifier + ".";
+ String dataScope = loginUser.getDataScope();
+ if (DATA_SCOPE_SELF.equals(dataScope)) {
+ return prefix + "create_user = " + loginUser.getUserId();
+ }
+ if (DATA_SCOPE_DEPT.equals(dataScope)) {
+ Long deptId = resolveDeptId(loginUser);
+ return deptId == null ? null : prefix + "dept_id = " + deptId;
+ }
+ if (DATA_SCOPE_CUSTOM.equals(dataScope) || DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
+ Long[] deptIds = loginUser.getDeptIds();
+ if (deptIds == null || deptIds.length == 0) {
+ return null;
+ }
+ StringBuilder builder = new StringBuilder(prefix).append("dept_id in (");
+ for (int i = 0; i < deptIds.length; i++) {
+ if (i > 0) {
+ builder.append(", ");
+ }
+ builder.append(deptIds[i]);
+ }
+ return builder.append(')').toString();
+ }
+ return null;
+ }
+
+ private Long resolveDeptId(LoginUser loginUser) {
+ if (loginUser.getCurrentDeptId() != null) {
+ return loginUser.getCurrentDeptId();
+ }
+ Long[] deptIds = loginUser.getDeptIds();
+ return deptIds != null && deptIds.length > 0 ? deptIds[0] : null;
+ }
+
+ private String appendCondition(String sql, String condition) {
+ int insertPos = findInsertPosition(sql);
+ String prefixSql = sql.substring(0, insertPos);
+ String suffixSql = sql.substring(insertPos);
+ if (hasTopLevelKeyword(prefixSql, "where")) {
+ return prefixSql + " AND " + DATA_SCOPE_MARKER + " " + condition + " " + suffixSql;
+ }
+ return prefixSql + " WHERE " + DATA_SCOPE_MARKER + " " + condition + " " + suffixSql;
+ }
+
+ private int findInsertPosition(String sql) {
+ int orderBy = findTopLevelKeyword(sql, "order by");
+ int groupBy = findTopLevelKeyword(sql, "group by");
+ int having = findTopLevelKeyword(sql, "having");
+ int limit = findTopLevelKeyword(sql, "limit");
+ int union = findTopLevelKeyword(sql, "union");
+ int insertPos = sql.length();
+ insertPos = minPositive(insertPos, orderBy);
+ insertPos = minPositive(insertPos, groupBy);
+ insertPos = minPositive(insertPos, having);
+ insertPos = minPositive(insertPos, limit);
+ insertPos = minPositive(insertPos, union);
+ return insertPos;
+ }
+
+ private int minPositive(int current, int candidate) {
+ return candidate >= 0 && candidate < current ? candidate : current;
+ }
+
+ private boolean hasTopLevelKeyword(String sql, String keyword) {
+ return findTopLevelKeyword(sql, keyword) >= 0;
+ }
+
+ private int findTopLevelKeyword(String sql, String keyword) {
+ String normalizedSql = sql.toLowerCase(Locale.ROOT);
+ String normalizedKeyword = keyword.toLowerCase(Locale.ROOT);
+ int depth = 0;
+ for (int i = 0; i <= normalizedSql.length() - normalizedKeyword.length(); i++) {
+ char current = normalizedSql.charAt(i);
+ if (current == '(') {
+ depth++;
+ continue;
+ }
+ if (current == ')') {
+ depth = Math.max(0, depth - 1);
+ continue;
+ }
+ if (depth > 0) {
+ continue;
+ }
+ if (matchesKeyword(normalizedSql, i, normalizedKeyword)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ private boolean matchesKeyword(String sql, int index, String keyword) {
+ if (!sql.regionMatches(index, keyword, 0, keyword.length())) {
+ return false;
+ }
+ boolean startOk = index == 0 || !Character.isLetterOrDigit(sql.charAt(index - 1));
+ int endIndex = index + keyword.length();
+ boolean endOk = endIndex >= sql.length() || !Character.isLetterOrDigit(sql.charAt(endIndex));
+ return startOk && endOk;
+ }
+
+ private TableSegment resolveMainTable(String sql) {
+ int fromIndex = findTopLevelKeyword(sql, "from");
+ if (fromIndex < 0) {
+ return null;
+ }
+ String fromPart = sql.substring(fromIndex + 4).trim();
+ if (fromPart.isEmpty() || fromPart.charAt(0) == '(') {
+ return null;
+ }
+ String[] tokens = fromPart.split("\\s+");
+ if (tokens.length == 0) {
+ return null;
+ }
+ String rawTableName = trimToken(tokens[0]);
+ if (rawTableName.isEmpty()) {
+ return null;
+ }
+ String alias = null;
+ if (tokens.length > 1) {
+ String second = trimToken(tokens[1]);
+ if ("as".equalsIgnoreCase(second) && tokens.length > 2) {
+ alias = trimToken(tokens[2]);
+ } else if (!isClauseKeyword(second)) {
+ alias = second;
+ }
+ }
+ String tableName = normalizeTableName(rawTableName);
+ String qualifier = alias != null && !alias.isEmpty() ? alias : rawTableName;
+ return new TableSegment(tableName, qualifier.replace("`", ""));
+ }
+
+ private String trimToken(String token) {
+ if (token == null) {
+ return "";
+ }
+ return token.replace(",", "").trim();
+ }
+
+ private String normalizeTableName(String tableName) {
+ String normalized = tableName.replace("`", "");
+ int dotIndex = normalized.lastIndexOf('.');
+ if (dotIndex >= 0) {
+ normalized = normalized.substring(dotIndex + 1);
+ }
+ return normalized;
+ }
+
+ private boolean isClauseKeyword(String token) {
+ String normalized = token.toLowerCase(Locale.ROOT);
+ return "left".equals(normalized)
+ || "right".equals(normalized)
+ || "inner".equals(normalized)
+ || "outer".equals(normalized)
+ || "join".equals(normalized)
+ || "where".equals(normalized)
+ || "order".equals(normalized)
+ || "group".equals(normalized)
+ || "limit".equals(normalized)
+ || "union".equals(normalized)
+ || "having".equals(normalized);
+ }
+
+ private static class TableSegment {
+ private final String tableName;
+ private final String qualifier;
+
+ private TableSegment(String tableName, String qualifier) {
+ this.tableName = tableName;
+ this.qualifier = qualifier;
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
index 686b975..2fea048 100644
--- a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
+++ b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
@@ -185,4 +185,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java b/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
index 722ab60..b19a74c 100644
--- a/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
+++ b/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
@@ -112,4 +112,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
index 966b8ae..6943b0a 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceDefectRecord.java
@@ -48,4 +48,7 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index f8c9e53..cd55444 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -159,4 +159,7 @@
@ApiModelProperty("璁惧绫诲瀷")
private String type;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index c3b73ad..5176f7d 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -98,4 +98,7 @@
private Long id;
private Integer quantity;
}
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
index 59226e1..352ea9a 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java
@@ -62,4 +62,7 @@
@ApiModelProperty("绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index 055a724..abcbf73 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -85,4 +85,7 @@
private Long id;
private Integer quantity;
}
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index a6f4432..ad9a709 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.device.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -106,4 +107,7 @@
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index 4911305..61442c4 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
@@ -40,4 +40,11 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index 20c9e8f..f5ed8da 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -56,4 +56,11 @@
@ApiModelProperty("灏栨")
@Excel(name = "灏栨")
private Double sharp;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
index 846fc8a..6277fab 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
@@ -139,4 +139,7 @@
*鎵�灞炵敤鐢靛尯鍩焛d
*/
private Long electricityConsumptionAreaId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
index 86950fd..c46495b 100644
--- a/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java
@@ -9,11 +9,13 @@
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import com.ruoyi.common.handler.CustomTenantLineHandler;
+import com.ruoyi.common.interceptor.DataScopeSqlInterceptor;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -27,8 +29,11 @@
*/
@EnableTransactionManagement(proxyTargetClass = true)
@Configuration
-public class MybatisPlusConfig
-{
+public class MybatisPlusConfig {
+
+ @Autowired
+ private DataScopeSqlInterceptor dataScopeSqlInterceptor;
+
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor()
{
@@ -42,6 +47,8 @@
interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
// 闃绘柇鎻掍欢
interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+ // 鏁版嵁鏉冮檺鎻掍欢
+ interceptor.addInnerInterceptor(dataScopeSqlInterceptor);
return interceptor;
}
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index bb91be1..168202f 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -79,7 +79,9 @@
/**
* 褰撳墠閮ㄩ棬id
*/
- private Long currentDeptId;
+ private Long currentDeptId;
+
+ private String dataScope;
public LoginUser()
{
@@ -314,7 +316,15 @@
return currentDeptId;
}
- public void setCurrentDeptId(Long currentDeptId) {
- this.currentDeptId = currentDeptId;
- }
-}
+ public void setCurrentDeptId(Long currentDeptId) {
+ this.currentDeptId = currentDeptId;
+ }
+
+ public String getDataScope() {
+ return dataScope;
+ }
+
+ public void setDataScope(String dataScope) {
+ this.dataScope = dataScope;
+ }
+}
diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index 7d09431..5799a03 100644
--- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -21,10 +21,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.security.LoginUser;
-import eu.bitwalker.useragentutils.UserAgent;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.framework.redis.RedisCache;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.project.system.domain.SysRole;
+import eu.bitwalker.useragentutils.UserAgent;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
@@ -159,14 +160,74 @@
{
loginUser.setLoginTime(System.currentTimeMillis());
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
- loginUser.setDeptIds(getDeptIdsByUserId(loginUser.getUserId()));
- loginUser.setCurrentDeptId(loginUser.getDeptIds()[0]);
+ loginUser.setDeptIds(getDeptIdsByUserId(loginUser.getUserId()));
+ if (loginUser.getDeptIds() != null && loginUser.getDeptIds().length > 0)
+ {
+ loginUser.setCurrentDeptId(loginUser.getDeptIds()[0]);
+ }
+ loginUser.setDataScope(resolveDataScope(loginUser));
// 鏍规嵁uuid灏唋oginUser缂撳瓨
String userKey = getTokenKey(loginUser.getToken());
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
}
- public Long[] getDeptIdsByUserId(Long userId){
+ public String resolveDataScope(LoginUser loginUser)
+ {
+ if (loginUser == null || loginUser.getUser() == null || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
+ {
+ return null;
+ }
+ boolean hasCustom = false;
+ boolean hasDeptAndChild = false;
+ boolean hasDept = false;
+ boolean hasSelf = false;
+ for (SysRole role : loginUser.getUser().getRoles())
+ {
+ if (role == null || !"0".equals(role.getStatus()))
+ {
+ continue;
+ }
+ if ("1".equals(role.getDataScope()))
+ {
+ return "1";
+ }
+ if ("2".equals(role.getDataScope()))
+ {
+ hasCustom = true;
+ }
+ else if ("4".equals(role.getDataScope()))
+ {
+ hasDeptAndChild = true;
+ }
+ else if ("3".equals(role.getDataScope()))
+ {
+ hasDept = true;
+ }
+ else if ("5".equals(role.getDataScope()))
+ {
+ hasSelf = true;
+ }
+ }
+ if (hasCustom)
+ {
+ return "2";
+ }
+ if (hasDeptAndChild)
+ {
+ return "4";
+ }
+ if (hasDept)
+ {
+ return "3";
+ }
+ if (hasSelf)
+ {
+ return "5";
+ }
+ return null;
+ }
+
+ public Long[] getDeptIdsByUserId(Long userId){
LambdaQueryWrapper<SysUserDept> sysUserDeptLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserDeptLambdaQueryWrapper.eq(SysUserDept::getUserId, userId);
List<SysUserDept> sysUserDept = sysUserDeptMapper.selectList(sysUserDeptLambdaQueryWrapper);
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index 4d95a96..dd11354 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -91,4 +91,7 @@
@TableField(exist = false)
private String dateStr;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
index 2065e2e..55fc343 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCode.java
@@ -1,5 +1,6 @@
package com.ruoyi.inspectiontask.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -60,4 +61,7 @@
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java
index 6bc1b4b..f487b67 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java
@@ -70,4 +70,7 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index fb852be..4019ca0 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.inspectiontask.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -106,4 +107,7 @@
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 3994833..b1732d4 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -169,4 +169,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
index 96803c5..7523853 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
@@ -142,6 +142,7 @@
private String unit;
@ApiModelProperty("閮ㄩ棬id")
+ @TableField(fill = FieldFill.INSERT)
private Long deptId;
@ApiModelProperty("瀹夎浣嶇疆")
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
index 75eed76..d69b57a 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedgerRecord.java
@@ -119,4 +119,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java
index 7eb0e68..b7822d1 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SpareParts.java
@@ -76,4 +76,7 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
index ae0b114..931fe7f 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/SparePartsRequisitionRecord.java
@@ -64,4 +64,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/oA/pojo/OaProject.java b/src/main/java/com/ruoyi/oA/pojo/OaProject.java
index 376f58f..4a5af5b 100644
--- a/src/main/java/com/ruoyi/oA/pojo/OaProject.java
+++ b/src/main/java/com/ruoyi/oA/pojo/OaProject.java
@@ -104,4 +104,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/oA/pojo/OaProjectPhase.java b/src/main/java/com/ruoyi/oA/pojo/OaProjectPhase.java
index 04326ed..b26bb9d 100644
--- a/src/main/java/com/ruoyi/oA/pojo/OaProjectPhase.java
+++ b/src/main/java/com/ruoyi/oA/pojo/OaProjectPhase.java
@@ -89,4 +89,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/oA/pojo/OaProjectPhaseTask.java b/src/main/java/com/ruoyi/oA/pojo/OaProjectPhaseTask.java
index 8241ce5..1b81069 100644
--- a/src/main/java/com/ruoyi/oA/pojo/OaProjectPhaseTask.java
+++ b/src/main/java/com/ruoyi/oA/pojo/OaProjectPhaseTask.java
@@ -114,4 +114,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java b/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
index b693c10..0237194 100644
--- a/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
+++ b/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
@@ -157,4 +157,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/other/pojo/PdaVersion.java b/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
index 5f15416..d772071 100644
--- a/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
+++ b/src/main/java/com/ruoyi/other/pojo/PdaVersion.java
@@ -54,4 +54,7 @@
@TableField(exist = false)
private List<CommonFile> commonFileList;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/other/pojo/TempFile.java b/src/main/java/com/ruoyi/other/pojo/TempFile.java
index 984fc7d..4e634cc 100644
--- a/src/main/java/com/ruoyi/other/pojo/TempFile.java
+++ b/src/main/java/com/ruoyi/other/pojo/TempFile.java
@@ -1,5 +1,8 @@
package com.ruoyi.other.pojo;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -19,4 +22,11 @@
private LocalDateTime expireTime; // 杩囨湡鏃堕棿
private Integer type; // 鍏宠仈琛ㄧ被鍨�
private Long fileSize; // 鏂囦欢澶у皬
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 5107c06..f4e6709 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -122,4 +122,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/GasTankWarning.java b/src/main/java/com/ruoyi/procurementrecord/pojo/GasTankWarning.java
index 4f95872..5868d95 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/GasTankWarning.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/GasTankWarning.java
@@ -155,4 +155,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java
index 56f322e..4cd2b0a 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/InboundManagement.java
@@ -70,4 +70,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java
index d9e7cc7..7a39af7 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementExceptionRecord.java
@@ -1,5 +1,6 @@
package com.ruoyi.procurementrecord.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Builder;
import lombok.Data;
@@ -51,4 +52,11 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java
index 56892a3..1508e19 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPlan.java
@@ -102,4 +102,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
index 08c9d21..1beae12 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementPriceManagement.java
@@ -119,4 +119,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
index dfa9756..e6f0798 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
@@ -92,4 +92,7 @@
*/
private Long productModelId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index 29e77c4..631e703 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -102,4 +102,7 @@
private Long productModelId;
private Long qualityInspectId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
index bae0caa..a0af810 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnManagement.java
@@ -71,4 +71,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
index 9a47197..b01cbad 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ReturnSaleProduct.java
@@ -1,5 +1,6 @@
package com.ruoyi.procurementrecord.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -57,4 +58,11 @@
@ApiModelProperty("鏄惁鏈夎川閲忛棶棰�(1-鏄� 2-鍚�)")
private Integer isQuality;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index fe661b3..3925f6e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -41,4 +41,11 @@
@ApiModelProperty(value = "BOM鐨処D")
private Integer bomId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
index 973b29e..57f567c 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
@@ -41,4 +41,11 @@
@ApiModelProperty(value ="鏄惁璐ㄦ")
private Boolean isQuality;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductBom.java b/src/main/java/com/ruoyi/production/pojo/ProductBom.java
index 802724a..f80cafe 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductBom.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductBom.java
@@ -69,4 +69,7 @@
@ApiModelProperty("绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index 5286cd3..a61ee96 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -103,4 +103,11 @@
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index e55ab4f..8f8211f 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -79,4 +79,11 @@
private Boolean isQuality;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
index 5d7ab56..9c1b5fc 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRoute.java
@@ -60,4 +60,11 @@
@ApiModelProperty("鐢熶骇璁㈠崟鐨刬d")
private Long productOrderId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
index d84a7ce..1f7c585 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
@@ -41,4 +41,11 @@
@ApiModelProperty(value ="鏄惁璐ㄦ")
private Boolean isQuality;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
index 32b39b6..e23427c 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductStructure.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -56,4 +57,11 @@
* 鐖惰妭鐐笽D
*/
private Long parentId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index 4efc694..bbfb332 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -122,4 +122,11 @@
private BigDecimal completeQuantity;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java
index 028e1ab..6e67334 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrderFile.java
@@ -62,4 +62,7 @@
@ApiModelProperty("绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
index 82bece9..52e8e04 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
@@ -30,4 +30,11 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 2064e04..a0301a0 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -51,4 +51,11 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index f78df35..3d1a032 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -33,4 +33,11 @@
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
index cb56f29..3ed3caf 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
@@ -87,4 +87,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java
index ac86061..8fb8a76 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerScheduling.java
@@ -103,4 +103,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerWork.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerWork.java
index 42d9e95..b251afc 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerWork.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerWork.java
@@ -134,4 +134,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/SpeculativeTradingInfo.java b/src/main/java/com/ruoyi/production/pojo/SpeculativeTradingInfo.java
index 4ac0567..8334755 100644
--- a/src/main/java/com/ruoyi/production/pojo/SpeculativeTradingInfo.java
+++ b/src/main/java/com/ruoyi/production/pojo/SpeculativeTradingInfo.java
@@ -78,4 +78,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/ContractInfo.java b/src/main/java/com/ruoyi/projectManagement/pojo/ContractInfo.java
index d568a02..a438a4e 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/ContractInfo.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/ContractInfo.java
@@ -135,4 +135,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Info.java b/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
index 999e787..5f5a0ab 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
@@ -213,4 +213,7 @@
@TableField(value = "update_user_name", fill = FieldFill.INSERT_UPDATE)
private String updateUserName;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/InfoStage.java b/src/main/java/com/ruoyi/projectManagement/pojo/InfoStage.java
index 052091a..d5c8643 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/InfoStage.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/InfoStage.java
@@ -1,5 +1,6 @@
package com.ruoyi.projectManagement.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -138,4 +139,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java b/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
index fd63a03..5f542e4 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Plan.java
@@ -87,4 +87,7 @@
@TableField(value = "update_user_name", fill = FieldFill.INSERT_UPDATE)
private String updateUserName;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/PlanNode.java b/src/main/java/com/ruoyi/projectManagement/pojo/PlanNode.java
index 3d9d9b1..1aac964 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/PlanNode.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/PlanNode.java
@@ -107,4 +107,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
index c284f13..ff8fed2 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Roles.java
@@ -53,4 +53,7 @@
@ApiModelProperty(value = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/ShippingAddress.java b/src/main/java/com/ruoyi/projectManagement/pojo/ShippingAddress.java
index ffc6940..dd552ce 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/ShippingAddress.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/ShippingAddress.java
@@ -79,4 +79,7 @@
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
index bcc868d..196a4bd 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/InvoicePurchase.java
@@ -1,5 +1,6 @@
package com.ruoyi.purchase.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -110,4 +111,11 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
index 803d600..3a83b3f 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
@@ -1,5 +1,6 @@
package com.ruoyi.purchase.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -102,4 +103,11 @@
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
index f7cae28..dc9d37e 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
@@ -1,5 +1,6 @@
package com.ruoyi.purchase.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -127,4 +128,11 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index e01db26..b56ab90 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -159,4 +159,11 @@
@ApiModelProperty(value = "瀹℃壒浜篿d")
private String approveUserIds;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
index 2bb53a4..4bb1312 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
@@ -1,5 +1,6 @@
package com.ruoyi.purchase.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -93,4 +94,11 @@
@TableField(exist = false)
private List<SalesLedgerProductTemplate> productList;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
index da9e769..4276a13 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrderProducts.java
@@ -48,4 +48,11 @@
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
index 5ff997f..217d798 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -114,4 +114,7 @@
@TableField(value = "update_user_name", fill = FieldFill.INSERT_UPDATE)
private String updateUserName;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
index 1c47d7b..d5f8b28 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
@@ -1,5 +1,7 @@
package com.ruoyi.purchase.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -81,4 +83,11 @@
@ApiModelProperty("鏄惁鎺ㄩ�佽川妫�")
private Boolean isChecked;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index e79796a..1845e44 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -163,4 +163,11 @@
@ApiModelProperty(value = "褰曞叆鏃堕棿")
private LocalDate enterDate;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 9d23429..8a5f425 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -157,4 +157,7 @@
private String workOrderNo;
@TableField(exist = false)
private String purchaseContractNo;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java
index 6ef6dd9..63d0886 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspectFile.java
@@ -58,4 +58,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java
index 91092d2..9992e85 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspectParam.java
@@ -89,4 +89,7 @@
private Integer index;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index d2fb853..2a2c758 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -69,4 +69,7 @@
@ApiModelProperty("宸ュ簭id")
private Integer processId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
index 3b15f5d..6bb1efb 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardBinding.java
@@ -56,4 +56,7 @@
@ApiModelProperty("绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
index 1abd96f..c9a1b98 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandardParam.java
@@ -68,4 +68,7 @@
@ApiModelProperty("榛樿鍊�")
private String defaultValue;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index d2f8e88..60760ec 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -140,4 +140,7 @@
@ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
private Boolean method;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java b/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
index 8bbc898..3792d0b 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeAccident.java
@@ -103,4 +103,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java b/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java
index 60a768a..cca0e3c 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeCertification.java
@@ -73,4 +73,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java
index e9efecc..012f02f 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeCertificationFile.java
@@ -57,4 +57,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java b/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
index 2cad42f..6812ea2 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeContingencyPlan.java
@@ -84,4 +84,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
index 43e5c1e..af7fb7f 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
@@ -90,4 +90,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
index 45ff844..c60913a 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
@@ -85,4 +85,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
index ba64039..86daf35 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
@@ -107,4 +107,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
index 59f67d1..bac10ce 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
@@ -54,4 +54,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java b/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
index f9ecc29..4010af1 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTraining.java
@@ -120,4 +120,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
index a53ea3d..7c8173c 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingDetails.java
@@ -92,4 +92,7 @@
@ApiModelProperty("澶囨敞")
@TableField(exist = false)
private String remarks;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
index 9ed72a7..87c559e 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeTrainingFile.java
@@ -54,4 +54,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
index b5c28b2..b797ab0 100644
--- a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
@@ -40,4 +41,11 @@
/** 鏇存柊鏃堕棿 */
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
index bac55ed..efb9b0c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedger.java
@@ -59,4 +59,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
index 344b369..363e388 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceLedgerFile.java
@@ -44,4 +44,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
index 080bd56..ddf6b79 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistration.java
@@ -50,4 +50,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
index 23a2557..f02e681 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
@@ -84,4 +84,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/Loss.java b/src/main/java/com/ruoyi/sales/pojo/Loss.java
index ad0a03e..fb64698 100644
--- a/src/main/java/com/ruoyi/sales/pojo/Loss.java
+++ b/src/main/java/com/ruoyi/sales/pojo/Loss.java
@@ -28,4 +28,11 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java b/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
index 17a691c..5d3f148 100644
--- a/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
+++ b/src/main/java/com/ruoyi/sales/pojo/PaymentShipping.java
@@ -80,4 +80,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java b/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java
index c0f76bb..32fac3c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/PurchaseLedgerFile.java
@@ -41,4 +41,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
index d53ae6a..12688c8 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ReceiptPayment.java
@@ -67,4 +67,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 36751c2..522b965 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -147,5 +147,12 @@
@TableField(exist = false)
//鏄惁鍙紪杈�
private Boolean isEdit;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 1bf9aa2..34aa729 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -1,5 +1,6 @@
package com.ruoyi.sales.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -243,4 +244,11 @@
// 鍙敤鏁伴噺 quantity - returnQuality
@TableField(exist = false)
private BigDecimal availableQuality;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index f57293d..2761fd7 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -67,4 +67,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
index 709dacf..4d7c9a1 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotationProduct.java
@@ -46,4 +46,7 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java b/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
index a0a6636..996351d 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalespersonManagement.java
@@ -76,4 +76,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java b/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
index 41a0d34..725fa4c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
@@ -349,4 +349,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "鐢熶骇鐘舵��")
private String productionStatus = "鏈紑濮�";
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index 82a657c..6ac6ecd 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -88,4 +88,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/Bank.java b/src/main/java/com/ruoyi/staff/pojo/Bank.java
index 482703b..d3634ed 100644
--- a/src/main/java/com/ruoyi/staff/pojo/Bank.java
+++ b/src/main/java/com/ruoyi/staff/pojo/Bank.java
@@ -1,5 +1,7 @@
package com.ruoyi.staff.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -30,4 +32,11 @@
@ApiModelProperty("閾惰鍚嶇О")
private String bankName;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java b/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java
index b76893e..101fc01 100644
--- a/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java
+++ b/src/main/java/com/ruoyi/staff/pojo/HolidayApplication.java
@@ -1,5 +1,6 @@
package com.ruoyi.staff.pojo;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -55,4 +56,11 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
index 647359e..13938c5 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceLocationConfig.java
@@ -1,5 +1,7 @@
package com.ruoyi.staff.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -60,4 +62,11 @@
@ApiModelProperty("鐝")
private String shift;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java
index 8e64e0c..f44047d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalAttendanceRecords.java
@@ -81,4 +81,11 @@
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java b/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
index 337ab96..b47d63d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
+++ b/src/main/java/com/ruoyi/staff/pojo/PersonalShift.java
@@ -56,4 +56,11 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime workTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
index e61df92..62346ff 100644
--- a/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
+++ b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
@@ -81,4 +81,7 @@
@ApiModelProperty("鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java b/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
index 9facc7b..4ae8362 100644
--- a/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/SchemeInsuranceDetail.java
@@ -66,4 +66,7 @@
@ApiModelProperty("鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffContract.java b/src/main/java/com/ruoyi/staff/pojo/StaffContract.java
index 9b2afee..2febd27 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffContract.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffContract.java
@@ -46,4 +46,11 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
index 8f7a35e..41001c3 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
@@ -76,4 +76,7 @@
@ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java b/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
index 1fdeefa..4c31f5e 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffEmergencyContact.java
@@ -62,4 +62,7 @@
@ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
index 188081b..ccb01be 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
@@ -44,4 +44,11 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime updateTime;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index cca0284..8cddc3e 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -247,4 +247,7 @@
private List<StaffEmergencyContact> staffEmergencyContactList;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
index 1ab10ab..53b5da5 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
@@ -99,4 +99,7 @@
@ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
index 191406b..e411eaa 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
@@ -90,4 +90,7 @@
@ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java b/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java
index a00040c..f1e3d47 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffScheduling.java
@@ -116,4 +116,7 @@
*/
@TableField(value = "tenant_id",fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java b/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
index 6d59f83..679098c 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffWorkExperience.java
@@ -76,4 +76,7 @@
@ApiModelProperty("淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index 395d18f..1d9e2d9 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -62,4 +62,7 @@
@ApiModelProperty(value = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
index 36e7cf0..beddc42 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInventory.java
@@ -63,4 +63,11 @@
@ApiModelProperty("澶囨敞")
private String remark;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
index e4e3b82..bc14ae0 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
@@ -71,4 +71,7 @@
@ApiModelProperty(value = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
private String type;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java b/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
index 6ed47de..4e5c05c 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockUninventory.java
@@ -59,4 +59,11 @@
@ApiModelProperty("琚鍗曢攣瀹氭暟閲�")
private BigDecimal lockedQuantity;
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
index 98855ce..4a9e617 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentClassification.java
@@ -64,4 +64,7 @@
private Long tenantId;
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
index 0c1a612..b4ec792 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Documentation.java
@@ -172,4 +172,7 @@
private Long tenantId;
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index a6c560f..b3a62f0 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -126,4 +126,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java
index c24805c..5c06c07 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationFile.java
@@ -57,4 +57,7 @@
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
index 5573923..304cd8c 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
@@ -127,4 +127,7 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
index a8ae602..f9403d5 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
@@ -59,4 +59,7 @@
private Long tenantId;
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
index d267986..43cb073 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelves.java
@@ -76,4 +76,7 @@
private Long tenantId;
private static final long serialVersionUID = 1L;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index 4372314..9038776 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -76,4 +76,7 @@
*/
private String remark;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java b/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
index e2c6e9b..c7c8f29 100644
--- a/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
+++ b/src/main/java/com/ruoyi/waterrecord/pojo/WaterRecord.java
@@ -132,4 +132,7 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 9eff9ac..1ad20a0 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -74,9 +74,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://1.15.17.182:9999/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/product-inventory-management-new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: xd@123456..
+ password: 123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
index d8f0a88..0232873 100644
--- a/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -31,5 +31,18 @@
<if test="params.no != null and params.no != '' ">
AND pro.no LIKE CONCAT('%',#{params.no},'%')
</if>
+ <if test="params.deptId != null">
+ AND pro.dept_id = #{params.deptId}
+ </if>
+ <if test="params.deptIds != null and params.deptIds.length > 0">
+ AND pro.dept_id IN
+ <foreach collection="params.deptIds" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ <if test="params.createUser != null">
+ AND pro.create_user = #{params.createUser}
+ </if>
+ ORDER BY pro.create_time DESC
</select>
</mapper>
diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml
index ee4d2a1..7259bd8 100644
--- a/src/main/resources/mybatis/mybatis-config.xml
+++ b/src/main/resources/mybatis/mybatis-config.xml
@@ -12,8 +12,7 @@
<!-- 閰嶇疆榛樿鐨勬墽琛屽櫒.SIMPLE灏辨槸鏅�氭墽琛屽櫒;REUSE鎵ц鍣ㄤ細閲嶇敤棰勫鐞嗚鍙�(prepared statements);BATCH鎵ц鍣ㄥ皢閲嶇敤璇彞骞舵墽琛屾壒閲忔洿鏂� -->
<setting name="defaultExecutorType" value="SIMPLE" />
<!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
- <setting name="logImpl" value="SLF4J" />
-<!-- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />-->
+ <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />
<!-- 浣跨敤椹煎嘲鍛藉悕娉曡浆鎹㈠瓧娈� -->
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
</settings>
--
Gitblit v1.9.3