From d5a74c1ff3126f69edab3d13c5b08acc33536565 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 9 Sep 2025 12:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=AD=90=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 7 +++++-- src/main/resources/application-dev.properties | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index f2e17bcf..f916ae31 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -3467,7 +3467,7 @@ public class AccountServiceImpl extends ServiceImpl impl addSubAccountDTO.setCreditsUsageLimit(BigDecimal.valueOf(dto.getCredisUsageLimit())); } addSubAccountDTO.setUserName(dto.getEmail().substring(0, dto.getEmail().indexOf("@"))); - addSubAccountDTO.setUserPassword(md5(parent.getOrganizationName().toLowerCase() + "abc")); + addSubAccountDTO.setUserPassword(md5("123456abc")); addSubAccountDTO.setCreditsUsage(BigDecimal.ZERO); // 添加用户 addSubAccount(addSubAccountDTO); @@ -3502,7 +3502,10 @@ public class AccountServiceImpl extends ServiceImpl impl @Override public Set organizationNameSearch(String type, String name) { QueryWrapper qw = new QueryWrapper<>(); - qw.lambda().like(Account::getOrganizationName, name); + if (!StringUtil.isNullOrEmpty(name)){ + qw.lambda().like(Account::getOrganizationName, name); + } + if (type.equals("School")) { Set schoolList = new HashSet<>(); schoolList.add(7L); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 0758b621..dabc7933 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -153,4 +153,4 @@ ollama.url=http://localhost:11434/api/chat google.client.id=29310152396-c44dcsoksjirhn7vbo29p8u8n0sg4qps.apps.googleusercontent.com google.client.secret=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 -google.redirect.uri=https://develop.aida.com.hk/api/third/party/auth/google_callback \ No newline at end of file +google.redirect.uri=https://develop.api.aida.com.hk/api/third/party/auth/google_callback \ No newline at end of file