From e3cdcf32a85155c78cab96e5829ca7d97bd05676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= <h17602169347@163.com>
Date: Wed, 8 May 2024 10:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/MybatisPlusMetaObjectHandler.java        | 13 +++++++++----
 .../java/jnpf/scheduletask/task/MyJobHandler.java   |  4 ++++
 .../jnpf/service/impl/SubjectbasicServiceImpl.java  |  4 ++--
 .../src/views/extend/customer/subjectbasic/form.vue |  6 ++----
 .../src/views/extend/service/subjectbasic/form.vue  |  6 ++----
 .../src/views/extend/supplier/subjectbasic/form.vue |  6 ++----
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java b/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
index 311e0745..d09437cd 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
+++ b/jnpf-java-boot/jnpf-admin/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
@@ -80,8 +80,9 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
 //        String tableName = tableInfo.getTableName();
         log.info("start insert fill ....");
         System.out.println(userInfo);
-        this.setFieldValByName("creatorUserId", userInfo.getUserId(), metaObject);
-
+        if(map.get("creatorUserId") == null || StringUtil.isEmpty(map.get("creatorUserId").toString())){
+            this.setFieldValByName("creatorUserId", userInfo.getUserId(), metaObject);
+        }
         this.setFieldValByName("creatorTime", DateUtil.getNowDate(), metaObject);
 
         this.setFieldValByName("creatorUserName", userInfo.getUserName(), metaObject);
@@ -100,8 +101,12 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
         if(map.get("organizeJsonId") == null || StringUtil.isEmpty(map.get("organizeJsonId").toString())){
             this.setFieldValByName("organizeJsonId", organizeId, metaObject);
         }
-        this.setFieldValByName("companyId", companyId, metaObject);
-        this.setFieldValByName("departmentId", userInfo.getDepartmentId(), metaObject);
+        if(map.get("companyId") == null || StringUtil.isEmpty(map.get("companyId").toString())){
+            this.setFieldValByName("companyId", companyId, metaObject);
+        }
+        if(map.get("departmentId") == null || StringUtil.isEmpty(map.get("departmentId").toString())){
+            this.setFieldValByName("departmentId", userInfo.getDepartmentId(), metaObject);
+        }
 //        System.out.println(userProvider.getDepartmentId(userInfo.getUserId()));
         /*if (userInfo.getUserId()!=null){
             this.setFieldValByName("departmentId", userProvider.getDepartmentId(userInfo.getUserId()), metaObject);
diff --git a/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/MyJobHandler.java b/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/MyJobHandler.java
index 313a8280..ab2e718b 100644
--- a/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/MyJobHandler.java
+++ b/jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/MyJobHandler.java
@@ -146,6 +146,8 @@ public class MyJobHandler {
             inventorySnapshotEntity.setStorageAreaId(inventoryEntity.getStorageAreaId());
             inventorySnapshotEntity.setBatchNumber(inventoryEntity.getBatchNumber());
             inventorySnapshotEntity.setTenantId(inventoryEntity.getTenantId());
+            inventorySnapshotEntity.setCreatorUserId(inventoryEntity.getCreatorUserId());
+            inventorySnapshotEntity.setOrganizeJsonId(inventoryEntity.getOrganizeJsonId());
             inventorySnapshotEntity.setCompanyId(inventoryEntity.getCompanyId());
             inventorySnapshotEntity.setDepartmentId(inventoryEntity.getDepartmentId());
             list.add(inventorySnapshotEntity);
@@ -243,6 +245,8 @@ public class MyJobHandler {
             inventorySnapshotEntity.setStorageAreaId(inventoryEntity.getStorageAreaId());
             inventorySnapshotEntity.setBatchNumber(inventoryEntity.getBatchNumber());
             inventorySnapshotEntity.setTenantId(inventoryEntity.getTenantId());
+            inventorySnapshotEntity.setCreatorUserId(inventoryEntity.getCreatorUserId());
+            inventorySnapshotEntity.setOrganizeJsonId(inventoryEntity.getOrganizeJsonId());
             inventorySnapshotEntity.setCompanyId(inventoryEntity.getCompanyId());
             inventorySnapshotEntity.setDepartmentId(inventoryEntity.getDepartmentId());
             list.add(inventorySnapshotEntity);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectbasicServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectbasicServiceImpl.java
index 2be82121..eb0ba0a8 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectbasicServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectbasicServiceImpl.java
@@ -604,7 +604,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
                 return "请输入正确的数字";
             }
         }
-        if(StringUtil.isNotEmpty(form.getDemandVolumeDown())){
+        /*if(StringUtil.isNotEmpty(form.getDemandVolumeDown())){
             if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getDemandVolumeDown())).matches()){
                 return "请输入正确的需求量下限";
             }
@@ -620,7 +620,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
             }
         }else{
             return "需求量上限不能为空";
-        }
+        }*/
         if(StringUtil.isEmpty(form.getAccountName())){
             return "账户名称不能为空";
         }
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue
index 29ba0be2..7920030c 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue
@@ -516,8 +516,7 @@
           </el-col>
 
           <el-col :span="8" v-if="judgeShow('collaborationStart')">
-            <jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')"
-              prop="collaborationStart">
+            <jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')" >
               <JnpfDatePicker v-model="dataForm.collaborationStart"
                 @change="changeData('collaborationStart', -1)"
                 :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
@@ -527,8 +526,7 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="16" v-if="judgeShow('demandVolumeDown')">
-            <jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')"
-              prop="demandVolumeDown">
+            <jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')">
               <JnpfInput v-model="dataForm.demandVolumeDown"
                 @change="changeData('demandVolumeDown', -1)" placeholder="请输入"
                 :disabled="judgeWrite('demandVolumeDown')" addonAfter="吨" clearable
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue
index 897166ac..8f03986b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue
@@ -514,8 +514,7 @@
           </el-col>
 
           <el-col :span="8" v-if="judgeShow('collaborationStart')">
-            <jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')"
-              prop="collaborationStart">
+            <jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')">
               <JnpfDatePicker v-model="dataForm.collaborationStart"
                 @change="changeData('collaborationStart',-1)" :startTime="dateTime(false,1,1,'','')"
                 :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
@@ -525,8 +524,7 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="16" v-if="judgeShow('demandVolumeDown')">
-            <jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')"
-              prop="demandVolumeDown">
+            <jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')">
               <JnpfInput v-model="dataForm.demandVolumeDown"
                 @change="changeData('demandVolumeDown',-1)" placeholder="请输入"
                 :disabled="judgeWrite('demandVolumeDown')" addonAfter="吨" clearable
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
index b23656d2..0ccbecd2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
@@ -522,8 +522,7 @@
           </el-col>
 
           <el-col :span="8" v-if="judgeShow('collaborationStart')">
-            <jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')"
-              prop="collaborationStart">
+            <jnpf-form-tip-item label="合作开始时间" v-if="judgeShow('collaborationStart')">
               <JnpfDatePicker v-model="dataForm.collaborationStart"
                 @change="changeData('collaborationStart',-1)" :startTime="dateTime(false,1,1,'','')"
                 :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
@@ -533,8 +532,7 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="16" v-if="judgeShow('demandVolumeDown')">
-            <jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')"
-              prop="demandVolumeDown">
+            <jnpf-form-tip-item label="需求量(每月)" v-if="judgeShow('demandVolumeDown')">
               <JnpfInput v-model="dataForm.demandVolumeDown"
                 @change="changeData('demandVolumeDown',-1)" placeholder="请输入"
                 :disabled="judgeWrite('demandVolumeDown')" addonAfter="吨" clearable