|
@@ -46,8 +46,6 @@ export class IndividualService extends BaseService {
|
|
|
if (!params?.registration_date) {
|
|
|
params.registration_date = this.utils.getNewTime()
|
|
|
}
|
|
|
- console.log(49, merchantId);
|
|
|
- return merchantId
|
|
|
const custom = {
|
|
|
...params,
|
|
|
out_user_id: merchantId,
|
|
@@ -94,10 +92,15 @@ export class IndividualService extends BaseService {
|
|
|
const queryParams: any[] = [];
|
|
|
if (roleIds.filter(id => [1, 3].includes(id)).length) {
|
|
|
// 角色为 1 或 3 时,仅查询 individual 表
|
|
|
+ // query = `
|
|
|
+ // SELECT *
|
|
|
+ // FROM individual
|
|
|
+ // WHERE individual.merchantId = '${merchantId}'
|
|
|
+ // ORDER BY individual.merchantId ASC
|
|
|
+ // `;
|
|
|
query = `
|
|
|
SELECT *
|
|
|
FROM individual
|
|
|
- WHERE individual.merchantId = '${merchantId}'
|
|
|
ORDER BY individual.merchantId ASC
|
|
|
`;
|
|
|
} else {
|