Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

野心家

2023-10-10 f9fca9fa8b2a1d7d9abe18b10717cf62c5c8bcaf

 src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java

@@ -19,7 +19,13 @@
        if (Cools.isEmpty(docName)) {
            return null;
        }
        DocType docType = this.selectById(docName);
        DocType docType = null;
        try {
            docType = this.selectById(docName);
        } catch (Exception ignore) {}
        if (docType == null) {
            docType = this.selectOne(new EntityWrapper<DocType>().eq("doc_name", docName));
        }
        if (docType == null) {
            long docId = 1L;
            DocType last = this.selectOne(new EntityWrapper<DocType>().orderBy("doc_id", false));