From e885a8a5cdd4f7496765c82d81dc9a7fa58739cc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 09 四月 2026 11:40:49 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 12 ++++++------
src/main/java/com/ruoyi/common/aop/DataScope.java | 28 ++++++++++++++++++++++++++++
src/main/resources/application-dev.yml | 4 ++--
3 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/aop/DataScope.java b/src/main/java/com/ruoyi/common/aop/DataScope.java
new file mode 100644
index 0000000..e50c85e
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/aop/DataScope.java
@@ -0,0 +1,28 @@
+package com.ruoyi.common.aop;
+
+import java.lang.annotation.*;
+
+/**
+ * 鏁版嵁鏉冮檺娉ㄨВ
+ * 鏍囪闇�瑕佽繘琛屾暟鎹殧绂荤殑Mapper鏂规硶
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataScope {
+
+ /**
+ * 閮ㄩ棬琛ㄧ殑鍒悕
+ */
+ String deptAlias() default "";
+
+ /**
+ * 鐢ㄦ埛琛ㄧ殑鍒悕锛堝搴攃reate_user瀛楁鎵�鍦ㄨ〃锛�
+ */
+ String userAlias() default "";
+
+ /**
+ * 鏄惁杩囨护鍒涘缓浜猴紙榛樿true锛屽嵆鏍规嵁create_user杩囨护锛�
+ */
+ boolean isFilterCreateUser() default true;
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index dec3d1c..5345963 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -64,12 +64,12 @@
return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
- List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
- for (QualityInspect qualityInspect : qualityInspects) {
- if(qualityInspect.getInspectState()==1){
- throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
- }
- }
+// List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
+// for (QualityInspect qualityInspect : qualityInspects) {
+// if(qualityInspect.getInspectState() != null && qualityInspect.getInspectState()==1){
+// throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁稿垹闄�");
+// }
+// }
//鍒犻櫎妫�楠屽弬鏁�
qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
.in(QualityInspectParam::getInspectId,ids));
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 733a186..f948919 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -146,8 +146,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
- # host: 172.17.0.1
+ host: localhost
+# host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
--
Gitblit v1.9.3