shumengya/cloud-mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复邮件列表发件无法搜索和不显示邮箱

Browse Source
This commit is contained in:
eoao
2025-06-29 14:25:39 +08:00
parent 33141fe7dd
commit c72213b97d
9 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mail-worker/dist/assets/index-CQpgk37-.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

52
mail-worker/dist/assets/index-DDsmLAr5.js → mail-worker/dist/assets/index-CdIfOmmZ.js vendored
View File

File diff suppressed because one or more lines are too long

1
mail-worker/dist/assets/index-p2lTpkGZ.css vendored
View File

File diff suppressed because one or more lines are too long

4
mail-worker/dist/index.html vendored
View File

@@ -6,8 +6,8 @@
<title></title>
<link rel="icon" href="/assets/favicon-C5dAZutX.svg" type="image/svg+xml">
<script src="https://challenges.cloudflare.com/turnstile/v0/api.js" async defer></script>
<script type="module" crossorigin src="/assets/index-DDsmLAr5.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-p2lTpkGZ.css">
<script type="module" crossorigin src="/assets/index-CdIfOmmZ.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-CQpgk37-.css">
</head>
<body>
<div id="loading-first">

11
mail-worker/src/service/email-service.js
View File

@@ -1,7 +1,7 @@
import orm from '../entity/orm';
import email from '../entity/email';
import { emailConst, isDel, settingConst } from '../const/entity-const';
import { and, desc, eq, gt, inArray, lt, count, asc, sql, ne } from 'drizzle-orm';
import { and, desc, eq, gt, inArray, lt, count, asc, sql, ne, or } from 'drizzle-orm';
import { star } from '../entity/star';
import settingService from './setting-service';
import accountService from './account-service';
@@ -467,7 +467,7 @@ const emailService = {
async allList(c, params) {
let { emailId, size, name, subject, accountEmail, userEmail, type, timeSort } = params;
let { emailId, size, name, subject, accountEmail, sendEmail, userEmail, type, timeSort } = params;
size = Number(size);
@@ -512,7 +512,12 @@ const emailService = {
}
if (accountEmail) {
conditions.push(sql`${email.toEmail} COLLATE NOCASE LIKE ${accountEmail + '%'}`);
conditions.push(
or(
sql`${email.toEmail} COLLATE NOCASE LIKE ${accountEmail + '%'}`,
sql`${email.sendEmail} COLLATE NOCASE LIKE ${accountEmail + '%'}`,
)
)
}
if (name) {