From df698fb979db6f1d571f548f40744a19e8c21ac2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 17:48:12 +0800
Subject: [PATCH] 属性对比
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index f1427f5..e1dd820 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -292,10 +292,10 @@
.selectAs(SystemUser::getUsername,Company::getManagerUserName);
queryWrapper.select(
"(select su1.USERNAME from system_user su1 where su1.id = t.MANAGER_ID) as managerUserName," +
- "(select su2.REALNAME from system_user su2 where su2.id = t.SALESMAN_ID) as salesmanRealName," +
- "(select count(su3.id) from system_user su3 where su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
- "(select count(su4.id) from system_user su4 where su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
- "(select count(g.id) from goods g where g.COMPANY_ID = t.ID )goodsNum");
+ "(select su2.REALNAME from system_user su2 where su2.isdeleted=0 and su2.id = t.SALESMAN_ID) as salesmanRealName," +
+ "(select count(su3.id) from system_user su3 where su3.isdeleted=0 and su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
+ "(select count(su4.id) from system_user su4 where su4.isdeleted=0 and su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
+ "(select count(g.id) from goods g where g.isdeleted=0 and g.COMPANY_ID = t.ID )goodsNum");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
--
Gitblit v1.9.3