diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index 2ba3290..1b4e8f7 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@
enable-sql-runner: true
db-config:
insert-strategy: not_empty
- update-strategy: not_empty
+ update-strategy: not_null
where-strategy: not_empty
# logic-delete-field: isDel #全局逻辑删除实体字段名
# logic-delete-value: 1 #逻辑已删除值
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index 2ba3290..1b4e8f7 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@
enable-sql-runner: true
db-config:
insert-strategy: not_empty
- update-strategy: not_empty
+ update-strategy: not_null
where-strategy: not_empty
# logic-delete-field: isDel #全局逻辑删除实体字段名
# logic-delete-value: 1 #逻辑已删除值
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index cbee0fb..0125f2c 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
compile
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index 2ba3290..1b4e8f7 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@
enable-sql-runner: true
db-config:
insert-strategy: not_empty
- update-strategy: not_empty
+ update-strategy: not_null
where-strategy: not_empty
# logic-delete-field: isDel #全局逻辑删除实体字段名
# logic-delete-value: 1 #逻辑已删除值
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index cbee0fb..0125f2c 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 1aced97..84af529 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index 2ba3290..1b4e8f7 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@
enable-sql-runner: true
db-config:
insert-strategy: not_empty
- update-strategy: not_empty
+ update-strategy: not_null
where-strategy: not_empty
# logic-delete-field: isDel #全局逻辑删除实体字段名
# logic-delete-value: 1 #逻辑已删除值
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index cbee0fb..0125f2c 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 1aced97..84af529 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
index ae21c3f..0324188 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
@@ -1,5 +1,6 @@
package com.casic.missiles.model.system;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -59,7 +60,7 @@
* 分系统id
*/
@ApiModelProperty(value = "分系统id(新增/编辑时传)",required = true)
- @TableField("sub_system_id")
+ @TableField(value = "sub_system_id",updateStrategy = FieldStrategy.IGNORED)
private Long subSystemId;
@ApiModelProperty("分系统名称")
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index 2ba3290..1b4e8f7 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@
enable-sql-runner: true
db-config:
insert-strategy: not_empty
- update-strategy: not_empty
+ update-strategy: not_null
where-strategy: not_empty
# logic-delete-field: isDel #全局逻辑删除实体字段名
# logic-delete-value: 1 #逻辑已删除值
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index cbee0fb..0125f2c 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 1aced97..84af529 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
index ae21c3f..0324188 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
@@ -1,5 +1,6 @@
package com.casic.missiles.model.system;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -59,7 +60,7 @@
* 分系统id
*/
@ApiModelProperty(value = "分系统id(新增/编辑时传)",required = true)
- @TableField("sub_system_id")
+ @TableField(value = "sub_system_id",updateStrategy = FieldStrategy.IGNORED)
private Long subSystemId;
@ApiModelProperty("分系统名称")
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 57508a3..7a53fd1 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-common
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index 2ba3290..1b4e8f7 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@
enable-sql-runner: true
db-config:
insert-strategy: not_empty
- update-strategy: not_empty
+ update-strategy: not_null
where-strategy: not_empty
# logic-delete-field: isDel #全局逻辑删除实体字段名
# logic-delete-value: 1 #逻辑已删除值
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index cbee0fb..0125f2c 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 1aced97..84af529 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
index ae21c3f..0324188 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
@@ -1,5 +1,6 @@
package com.casic.missiles.model.system;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -59,7 +60,7 @@
* 分系统id
*/
@ApiModelProperty(value = "分系统id(新增/编辑时传)",required = true)
- @TableField("sub_system_id")
+ @TableField(value = "sub_system_id",updateStrategy = FieldStrategy.IGNORED)
private Long subSystemId;
@ApiModelProperty("分系统名称")
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 57508a3..7a53fd1 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-common
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
index 3b2e9f4..017116a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
@@ -119,7 +119,8 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
DataScope dataScope = authService.getLoginUserDataScope();
if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
- queryWrapper.in("sub_system_id",dataScope.getDeptIds());
+ queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+ .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
}
if(StrUtil.isNotEmpty(positionName)){
queryWrapper.like("position_name", positionName);
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 786e581..f244a34 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index 4fe8f29..78f0483 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml
index 3eb527f..ca120ef 100644
--- a/casic-metering-eqpt-api/pom.xml
+++ b/casic-metering-eqpt-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-job
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-eqpt-api/src/main/resources/config/application.yml b/casic-metering-eqpt-api/src/main/resources/config/application.yml
index 2ba3290..1b4e8f7 100644
--- a/casic-metering-eqpt-api/src/main/resources/config/application.yml
+++ b/casic-metering-eqpt-api/src/main/resources/config/application.yml
@@ -38,7 +38,7 @@
enable-sql-runner: true
db-config:
insert-strategy: not_empty
- update-strategy: not_empty
+ update-strategy: not_null
where-strategy: not_empty
# logic-delete-field: isDel #全局逻辑删除实体字段名
# logic-delete-value: 1 #逻辑已删除值
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index cbee0fb..0125f2c 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.2.0.7
+ 1.2.0.8
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index 1aced97..84af529 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
index ae21c3f..0324188 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/system/SystemPosition.java
@@ -1,5 +1,6 @@
package com.casic.missiles.model.system;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -59,7 +60,7 @@
* 分系统id
*/
@ApiModelProperty(value = "分系统id(新增/编辑时传)",required = true)
- @TableField("sub_system_id")
+ @TableField(value = "sub_system_id",updateStrategy = FieldStrategy.IGNORED)
private Long subSystemId;
@ApiModelProperty("分系统名称")
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index 57508a3..7a53fd1 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-eqpt-xichang
com.casic
- 1.2.0.7
+ 1.2.0.8
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-model
- 1.2.0.7
+ 1.2.0.8
com.casic
casic-metering-common
- 1.2.0.7
+ 1.2.0.8
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
index 3b2e9f4..017116a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemPositionServiceImpl.java
@@ -119,7 +119,8 @@
QueryWrapper queryWrapper = new QueryWrapper<>();
DataScope dataScope = authService.getLoginUserDataScope();
if(!ALL_TYPE.equals(dataScope.getScopeEnums())){
- queryWrapper.in("sub_system_id",dataScope.getDeptIds());
+ queryWrapper.and(i->i.in("sub_system_id",dataScope.getDeptIds())
+ .or().isNull("sub_system_id").in("dept_id",dataScope.getDeptIds()));
}
if(StrUtil.isNotEmpty(positionName)){
queryWrapper.like("position_name", positionName);
diff --git a/pom.xml b/pom.xml
index e6e45e1..984614f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.casic
casic-metering-eqpt-xichang
- 1.2.0.7
+ 1.2.0.8
casic-metering-eqpt-xichang
pom