no message

src/main/java/com/chenyang/nse/bussiness/service/core/impl/encryption/TCoreEncryptionServiceImpl.java

@@ -216,13 +216,17 @@ public class TCoreEncryptionServiceImpl implements TCoreEncryptionService {
    }
 
    public List<TCoreEncryption> queryEncryptionList(String encryption_name) {
-      List<TCoreEncryption> encryptionList = this.tCoreEncryptionDao.queryAll(new Criterion[]{Restrictions.like("encryption_name", encryption_name, MatchMode.ANYWHERE)});
-
-      for(TCoreEncryption tCoreEncryption : encryptionList) {
-         List<TCoreSecretkey> keyList = this.tCoreSecretkeyDao.queryAll(new Criterion[]{Restrictions.eq("encryption_id", tCoreEncryption.getId())});
+      List<Criterion> criteria = new ArrayList<>();
+      if (encryption_name != null && !encryption_name.trim().isEmpty()) {
+         criteria.add(Restrictions.like("encryption_name", encryption_name, MatchMode.ANYWHERE));
+      }
+      List<TCoreEncryption> encryptionList = this.tCoreEncryptionDao.queryAll(criteria.toArray(new Criterion[0]));
+      for (TCoreEncryption tCoreEncryption : encryptionList) {
+         List<TCoreSecretkey> keyList = this.tCoreSecretkeyDao.queryAll(
+                 new Criterion[]{Restrictions.eq("encryption_id", tCoreEncryption.getId())}
+         );
          tCoreEncryption.setList(keyList);
       }
-
       return encryptionList;
    }