|
@@ -221,16 +221,17 @@ export class ContactApplyService extends BaseServiceV2 {
|
|
* 允许重复多次申请,但是每次必须都得审核完后再申请
|
|
* 允许重复多次申请,但是每次必须都得审核完后再申请
|
|
* 如果有:直接返回信息;
|
|
* 如果有:直接返回信息;
|
|
* 如果没有,返回继续执行
|
|
* 如果没有,返回继续执行
|
|
|
|
+ * 2024-09-24没有用户也允许通过
|
|
* @param data
|
|
* @param data
|
|
*/
|
|
*/
|
|
async checkHasApply(data) {
|
|
async checkHasApply(data) {
|
|
const apply_user = get(data, 'apply_user');
|
|
const apply_user = get(data, 'apply_user');
|
|
- const target_user = get(data, 'target_user');
|
|
|
|
|
|
+ // const target_user = get(data, 'target_user');
|
|
const source = get(data, 'source');
|
|
const source = get(data, 'source');
|
|
const source_id = get(data, 'source_id');
|
|
const source_id = get(data, 'source_id');
|
|
const builder = this.model.createQueryBuilder().where(`"apply_user" = :apply_user`, { apply_user });
|
|
const builder = this.model.createQueryBuilder().where(`"apply_user" = :apply_user`, { apply_user });
|
|
- if (!this.skipCheckList.includes(source)) builder.andWhere(`"target_user" = :target_user`, { target_user });
|
|
|
|
- else {
|
|
|
|
|
|
+ // if (!this.skipCheckList.includes(source)) builder.andWhere(`"target_user" = :target_user`, { target_user });
|
|
|
|
+ if(this.skipCheckList.includes(source)) {
|
|
builder.andWhere(`"source" =:source`, { source });
|
|
builder.andWhere(`"source" =:source`, { source });
|
|
builder.andWhere(`"source_id" =:source_id`, { source_id });
|
|
builder.andWhere(`"source_id" =:source_id`, { source_id });
|
|
}
|
|
}
|