diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java index d4b9cfc03..f78ec005c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java @@ -80,6 +80,7 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -490,7 +491,11 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl() .set(XzSecurityQualityInspectionRecordDraft::getIsGenerate, 1) diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index 40439d6d3..55d6a35f0 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -128,3 +128,4 @@ roomIntoNumErr=\u5BBF\u820D\u5E8A\u4F4D\u6570\u9700\u5927\u4E8E\u5DF2\u4F4F\u5BB roomExistErr=\u623F\u95F4\u53F7\u5DF2\u5B58\u5728 bedFullErr=\u5E8A\u4F4D\u5DF2\u6EE1\uFF01 thirdErr=\u8C03\u7528\u7B2C\u4E09\u65B9\u63A5\u53E3\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u4E0B\u914D\u7F6E +operateBusyErr=\u64CD\u4F5C\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u5237\u65B0\u9875\u9762 diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index c912f689f..a1d2577aa 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -125,3 +125,4 @@ roomIntoNumErr=\u5BBF\u820D\u5E8A\u4F4D\u6570\u9700\u5927\u4E8E\u5DF2\u4F4F\u5BB roomExistErr=\u623F\u95F4\u53F7\u5DF2\u5B58\u5728 bedFullErr=\u5E8A\u4F4D\u5DF2\u6EE1\uFF01 thirdErr=\u8C03\u7528\u7B2C\u4E09\u65B9\u63A5\u53E3\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u4E0B\u914D\u7F6E +operatorBusyErr=\u64CD\u4F5C\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u5237\u65B0\u9875\u9762