From c50aaed95e3f9d8b4e2c56445b4cbeeaebfba056 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 6 Jun 2022 14:41:51 +0800
Subject: [PATCH 1/5] =?UTF-8?q?bug53596=E8=99=9A=E6=8B=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=92=A4=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 34 ++++++++++++-------
 .../impl/ProjectLibraryBaseServiceImpl.java   |  4 +++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index e8c28fb9f..8421d7d1e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -1084,22 +1084,32 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     //拼接维护清单的消息
                     contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
                     contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
-
+                    //封装消息的实体类
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+                    bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
+                    //飞书
+                    try {
+                        iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href);
+                    } catch (IOException e) {
+                        log.error("飞书消息推送失败");
+                    }
                 }else{//撤回的消息
                     content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
                     contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
-                    contentInfoTemp = contentInfo;
-                }
-                //封装消息的实体类
-                SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
-                sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-                bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
-                //飞书
-                try {
-                    iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href);
-                } catch (IOException e) {
-                    log.error("飞书消息推送失败");
+
+                    //封装消息的实体类
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+                    bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
+                    //飞书
+                    try {
+                        iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfo, MessageTypeEnum.PUSH.getName(), null);
+                    } catch (IOException e) {
+                        log.error("飞书消息推送失败");
+                    }
                 }
+
             }
         }
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 48c7b7b21..43c0981f3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -10,6 +10,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
 import com.jero.modules.project.enums.*;
 import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
@@ -79,6 +80,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Autowired
 	private ProjectNameInfoEOServiceImpl projectNameInfoEOService;
 
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
+
 	/**
 	 * 保存
 	 *

From 99b23477a5ec5ea93ff453f1b698d7dfd1313e3b Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 6 Jun 2022 14:44:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?[update]=20=E6=8E=A7=E4=BB=B6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue                 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 35741f5af..63e469f5f 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -802,6 +802,9 @@ export default {
               if(itemIn !== 'sdt') {
                 if(item[itemIn] instanceof Object) {
                   postDateobj[itemIn] = item[itemIn]
+                  if(item[itemIn].list[0].dataValue instanceof Array) {
+                    item[itemIn].list[0].dataValue = item[itemIn].list[0].dataValue.join(',')
+                  }
                 }
               }
             })

From 48aaf0ee71f01ee93cab7c7893108bb69b503656 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 6 Jun 2022 14:50:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=9A=84=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../library/docDetail/index.vue               |  40 ++--
 jero-web/src/views/system/DictItemList.vue    |  11 +-
 jero-web/src/views/system/DictList.vue        |  13 +-
 .../views/system/modules/DictItemModal.vue    | 193 +++++++++++-------
 4 files changed, 161 insertions(+), 96 deletions(-)

diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index e3ae74377..cc552b957 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -9,11 +9,9 @@
           <a-tooltip placement="topLeft">
             <template slot="title">
               <span
-                v-html="titleHeader"></span>
+                v-html="serial_number"></span>
             </template>
-            <span v-html="$route.query.serial_number"></span>
-            <span v-html="this.$route.query.title == undefined || this.$route.query.title == null
-               || !this.$route.query.title ?'《'+ ''+'》':'《'+ this.$route.query.title+'》'"></span>
+            <span v-html="serial_number"></span>
             <span> {{$t('StandardDetails')}}</span>
           </a-tooltip>
 
@@ -258,6 +256,7 @@
         </span>
       </a-table>
     </a-modal>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
     <uploadFile ref="uploadFile" :isUploadFile="true" :disabled="true"></uploadFile>
   </div>
 </template>
@@ -275,10 +274,12 @@
       return {
         url: {
           getInfo: 'document/bussDocumentLibraryEO/getInfoById',
-          list: 'log/bussLogEO/page'
+          list: 'log/bussLogEO/page',
+          getTitle: '/document/bussDocumentLibraryEO/getTitle'
         },
         titleHeader: '',
         visibleFile: false,
+        loading: false,
         columnsRelated: [
           {
             title: this.$t('standardName'),
@@ -306,6 +307,7 @@
         dataSourceRelated: [],
         detailList: [],
         visible: false,
+        serial_number: '',
         confirmLoading: false,
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         loading: false,
@@ -341,24 +343,30 @@
       }
     },
     created() {
-      this.getInfoById()
-      if (this.$route.query.serial_number && this.$route.query.title) {
-        this.titleHeader = this.$route.query.serial_number + ' 《' + this.$route.query.title + ' 》' + this.$t('StandardDetails')
-      } else if (!this.$route.query.serial_number && this.$route.query.title) {
-        this.titleHeader = '《' + this.$route.query.title + '》' + this.$t('StandardDetails')
-      } else if (this.$route.query.serial_number && !this.$route.query.title) {
-        this.titleHeader = this.$route.query.serial_number + ' 《' + ' 》' + this.$t('StandardDetails')
-      } else {
-        this.titleHeader = ' 《' + ' 》' + this.$t('StandardDetails')
-      }
+      let _this = this
+      this.loading = true
+      this.getTitle(function() {
+        _this.getInfoById()
+      })
     },
     methods: {
+      getTitle(callback) {
+        let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
+        getAction(this.url.getTitle, { id: _id }).then((res) => {
+          if (res.success) {
+            this.serial_number = res.result
+            callback && callback()
+          } else {
+            this.serial_number = ''
+          }
+        })
+      },
       getInfoById() {
         let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
-        console.log(_id)
         getAction(this.url.getInfo, { id: _id }).then((res) => {
           if (res.success) {
             this.detailList = res.result
+            this.loading = false
           } else {
             this.detailList = []
           }
diff --git a/jero-web/src/views/system/DictItemList.vue b/jero-web/src/views/system/DictItemList.vue
index 83986357d..41a03ead3 100644
--- a/jero-web/src/views/system/DictItemList.vue
+++ b/jero-web/src/views/system/DictItemList.vue
@@ -53,7 +53,7 @@
             ref="table"
             rowKey="id"
             size="middle"
-            :scroll="{x: 900}"
+            :scroll="{x: '100%'}"
             :columns="columns"
             :dataSource="dataSource"
             :pagination="ipagination"
@@ -94,22 +94,29 @@
           {
             title: this.$t('name'),
             align: "center",
+            width:100,
+            ellipsis: true,
             dataIndex: 'itemText',
           },
           {
             title: this.$t('enName'),
             align: "center",
+            width:100,
+            ellipsis: true,
             dataIndex: 'enName',
           },
           {
             title: this.$t('DataValue'),
             align: "center",
+            width:100,
+            ellipsis: true,
             dataIndex: 'itemValue',
           },
           {
             title: this.$t('operation'),
             dataIndex: 'action',
             align: "center",
+            width:80,
             scopedSlots: {customRender: 'action'},
           }
         ],
@@ -122,7 +129,7 @@
         },
         title: this.$t('operation'),
         visible: false,
-        screenWidth: 800,
+        screenWidth: 900,
         model: {},
         dictId: "",
         status: 1,
diff --git a/jero-web/src/views/system/DictList.vue b/jero-web/src/views/system/DictList.vue
index 852a42dd9..207cb1fcd 100644
--- a/jero-web/src/views/system/DictList.vue
+++ b/jero-web/src/views/system/DictList.vue
@@ -129,10 +129,17 @@
             align: 'center',
             dataIndex: 'dictName',
             width: '25%',
-            ellipsis: true,
+            ellipsis: true
           },
           // {
           //   title: this.$t('DictionaryEnName'),
+          //   align: 'center',
+          //   dataIndex: 'dictEnName',
+          //   width: '180',
+          //   ellipsis: true
+          // },
+          // {
+          //   title: this.$t('DictionaryEnName'),
           //   align: "left",
           //   width: 180,
           //   dataIndex: 'dictEnName',
@@ -142,14 +149,14 @@
             align: 'center',
             dataIndex: 'dictCode',
             width: '25%',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('describe'),
             align: 'center',
             dataIndex: 'description',
             width: '25%',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('operation'),
diff --git a/jero-web/src/views/system/modules/DictItemModal.vue b/jero-web/src/views/system/modules/DictItemModal.vue
index 420753ad2..dae926132 100644
--- a/jero-web/src/views/system/modules/DictItemModal.vue
+++ b/jero-web/src/views/system/modules/DictItemModal.vue
@@ -14,39 +14,44 @@
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="名称">
-          <a-input placeholder="请输入名称" v-decorator.trim="['itemText', validatorRules.itemText]"/>
+          :label="$t('name')">
+          <a-input :placeholder="$t('PleaseEnter')+$t('name')" v-decorator.trim="['itemText', validatorRules.itemText]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          :label="$t('enName')">
+          <a-input :placeholder="$t('PleaseEnter')+$t('enName')" v-decorator.trim="['enName', validatorRules.enName]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          :label="$t('DataValue')">
+          <a-input :placeholder="$t('PleaseEnter')+$t('DataValue')" v-decorator.trim="['itemValue', validatorRules.itemValue]"/>
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="数据值">
-          <a-input placeholder="请输入数据值" v-decorator.trim="['itemValue', validatorRules.itemValue]"/>
+          :label="$t('describe')">
+          <a-input :placeholder="$t('PleaseEnter')+$t('describe')" v-decorator.trim="['description', validatorRules.description]"/>
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="描述">
-          <a-input v-decorator="['description']"/>
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="排序值">
+          :label="$t('sort')">
           <a-input-number :min="1" v-decorator="['sortOrder',{'initialValue':1}]"/>
           值越小越靠前，支持小数
         </a-form-item>
 
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="是否启用"
-          hasFeedback>
-          <a-switch checkedChildren="启用" unCheckedChildren="禁用" @change="onChose" v-model="visibleCheck"/>
-        </a-form-item>
+        <!--        <a-form-item-->
+        <!--          :labelCol="labelCol"-->
+        <!--          :wrapperCol="wrapperCol"-->
+        <!--          label="是否启用"-->
+        <!--          hasFeedback>-->
+        <!--          <a-switch checkedChildren="启用" unCheckedChildren="禁用" @change="onChose" v-model="visibleCheck"/>-->
+        <!--        </a-form-item>-->
 
       </a-form>
     </a-spin>
@@ -55,130 +60,168 @@
 
 <script>
   import pick from 'lodash.pick'
-  import {addDictItem, editDictItem} from '@/api/api'
+  import { addDictItem, editDictItem } from '@/api/api'
   import { getAction } from '@api/manage'
 
   export default {
-    name: "DictItemModal",
+    name: 'DictItemModal',
     data() {
       return {
-        title: "操作",
+        title: '操作',
         visible: false,
         visibleCheck: true,
         model: {},
-        dictId: "",
+        dictId: '',
         status: 1,
         labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
+          xs: { span: 24 },
+          sm: { span: 5 }
         },
         wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
+          xs: { span: 24 },
+          sm: { span: 16 }
         },
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules: {
-          itemText: {rules: [{required: true, message: '请输入名称!'}]},
-          itemValue: {rules: [{required: true, message: '请输入数据值!'},{validator: this.validateItemValue}]},
-        },
+          itemText: {
+            rules: [
+              { required: true, message: this.$t('name') + this.$t('cannotEmpty') },
+              {
+                max: 100,
+                message: this.$t('name') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+                trigger: 'blur'
+              }
+            ]
+          },
+          itemValue: {
+            rules: [
+              { required: true, message: this.$t('DataValue') + this.$t('cannotEmpty') },
+              {
+                max: 100,
+                message: this.$t('DataValue') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+                trigger: 'blur'
+              },
+              { validator: this.validateItemValue }
+            ]
+          },
+          enName: {
+            rules: [
+              { required: true, message: this.$t('enName') + this.$t('cannotEmpty') },
+              {
+                max: 100,
+                message: this.$t('enName') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+                trigger: 'blur'
+              }
+            ]
+          },
+          description: {
+            rules: [
+              {
+                max: 300,
+                message: this.$t('describe') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+                trigger: 'blur'
+              }
+            ]
+          }
+        }
       }
     },
     created() {
     },
     methods: {
       add(dictId) {
-        this.dictId = dictId;
-        this.edit({});
+        this.dictId = dictId
+        this.edit({})
       },
       edit(record) {
         if (record.id) {
-          this.dictId = record.dictId;
-          this.status = record.status;
-          this.visibleCheck = (record.status == 1) ? true : false;
+          this.dictId = record.dictId
+          this.status = record.status
+          this.visibleCheck = (record.status == 1) ? true : false
         }
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.model.dictId = this.dictId;
-        this.model.status = this.status;
-        this.visible = true;
+        this.form.resetFields()
+        this.model = Object.assign({}, record)
+        this.model.dictId = this.dictId
+        this.model.status = this.status
+        this.visible = true
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model, 'itemText', 'itemValue', 'description', 'sortOrder'))
-        });
+        })
       },
       onChose(checked) {
         if (checked) {
-          this.status = 1;
-          this.visibleCheck = true;
+          this.status = 1
+          this.visibleCheck = true
         } else {
-          this.status = 0;
-          this.visibleCheck = false;
+          this.status = 0
+          this.visibleCheck = false
         }
       },
       // 确定
       handleOk() {
-        const that = this;
+        const that = this
         // 触发表单验证
         this.form.validateFields((err, values) => {
           if (!err) {
-            that.confirmLoading = true;
+            that.confirmLoading = true
             values.itemText = (values.itemText || '').trim()
             values.itemValue = (values.itemValue || '').trim()
             values.description = (values.description || '').trim()
-            let formData = Object.assign(this.model, values);
-            formData.status = this.status;
-            let obj;
+            let formData = Object.assign(this.model, values)
+            formData.status = this.status
+            let obj
             if (!this.model.id) {
-              obj = addDictItem(formData);
+              obj = addDictItem(formData)
             } else {
-              obj = editDictItem(formData);
+              obj = editDictItem(formData)
             }
             obj.then((res) => {
               if (res.success) {
-                that.$message.success(res.message);
-                that.$emit('ok');
+                that.$message.success(res.message)
+                that.$emit('ok')
               } else {
-                that.$message.warning(res.message);
+                that.$message.warning(res.message)
               }
             }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
+              that.confirmLoading = false
+              that.close()
             })
           }
         })
       },
       // 关闭
       handleCancel() {
-        this.close();
+        this.close()
       },
       close() {
-        this.$emit('close');
-        this.visible = false;
+        this.$emit('close')
+        this.visible = false
       },
-      validateItemValue(rule, value, callback){
+      validateItemValue(rule, value, callback) {
         let param = {
-          itemValue:value,
-          dictId:this.dictId,
+          itemValue: value,
+          dictId: this.dictId
         }
-        if(this.model.id){
+        if (this.model.id) {
           param.id = this.model.id
         }
-        if(value){
-          let reg=new RegExp("[`_~!@#$^&*()=|{}'.<>《》/?！￥（）—【】‘；：”“。，、？]")
-          if(reg.test(value)){
-            callback("数据值不能包含特殊字符！")
-          }else{
+        if (value) {
+          let reg = new RegExp('[`_~!@#$^&*()=|{}\'.<>《》/?！￥（）—【】‘；：”“。，、？]')
+          if (reg.test(value)) {
+            callback('数据值不能包含特殊字符！')
+          } else {
             //update--begin--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
-            getAction("/sys/dictItem/dictItemCheck",param).then((res)=>{
-              if(res.success){
+            getAction('/sys/dictItem/dictItemCheck', param).then((res) => {
+              if (res.success) {
                 callback()
-              }else{
-                callback(res.message);
+              } else {
+                callback(res.message)
               }
-            });
+            })
             //update--end--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复
           }
-        }else{
+        } else {
           callback()
         }
       }

From 92087ac0384414dc27dd05d154caf55541be4c68 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 6 Jun 2022 14:56:13 +0800
Subject: [PATCH 4/5] =?UTF-8?q?bug53619=E7=B3=BB=E7=BB=9F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/SysDictItemController.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
index 60cc01049..443b840af 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
@@ -13,6 +13,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.enums.DictCodeEnum;
 import com.jero.modules.enums.FixedFieldEnum;
+import com.jero.modules.enums.IsTagDict;
 import com.jero.modules.system.entity.SysDict;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.mapper.SysDictItemMapper;
@@ -104,7 +105,9 @@ public class SysDictItemController {
 				sysDictItem.setItemText(sysDictItem.getItemText().replace(" ",""));
 				sysDictItem.setCreateTime(new Date());
 				sysDictItem.setDelFlag(CommonConstant.DEL_FLAG_0);
-				sysDictItem.setItemValue(UUID.randomUUID().toString().replace("-", ""));
+				if (sysDictItem.getIsTagDict() == IsTagDict.TAG_DICT.getValue()) {
+					sysDictItem.setItemValue(UUID.randomUUID().toString().replace("-", ""));
+				}
 //			sysDictItem.setItemValue(String.valueOf(RandomUtils.nextLong()));
 				sysDictItem.setStatus(1);
 				sysDictItemService.save(sysDictItem);

From 97492d609edf860e8a13b0292eef56ba505766d4 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 6 Jun 2022 14:59:08 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E6=92=A4=E5=9B=9E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 03c463e9b..9638c85b2 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -836,8 +836,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					|| CollectManifestStateEnum.DRE_BACK.getValue().equals(state)) {
 				updateEO.setState(String.valueOf(state - 1)); // 设置对应状态
 
-			} else if (CollectManifestStateEnum.WAIT_SDT.getValue().equals(state)
-					|| CollectManifestStateEnum.WAIT_SDT.getValue().equals(state)) {
+			} else if (CollectManifestStateEnum.WAIT_FILL.getValue().equals(state)
+					|| CollectManifestStateEnum.SUBMIT.getValue().equals(state)) {
 				updateEO.setState(String.valueOf(state - 2)); // 设置对应状态
 
 			}