|
@@ -568,7 +568,7 @@ public class AdminUserLogic {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- public IPage<AdminUser> list(String companyWechatId, String companyWechatName, String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize,String websitId) {
|
|
|
+ public IPage<AdminUser> list(Boolean isWebsit,String companyWechatId, String companyWechatName, String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize,String websitId) {
|
|
|
AdminUserCom adminUser = commonLogic.getAdminUser();
|
|
|
|
|
|
if (adminUser.getType() != 2) {
|
|
@@ -600,6 +600,7 @@ public class AdminUserLogic {
|
|
|
.like(StringUtils.isNotBlank(companyWechatName), AdminUser::getCompanyName, companyWechatName)
|
|
|
.eq(StringUtils.isNotBlank(roleId), AdminUser::getRoleId, roleId)
|
|
|
.eq(status != null, AdminUser::getStatus, status)
|
|
|
+ .eq(isWebsit != null && !isWebsit, AdminUser::getType, 1)
|
|
|
.and(StringUtils.isNotBlank(userName), v -> v.like(AdminUser::getUserName, userName)
|
|
|
.or()
|
|
|
.like(AdminUser::getNickName, userName))
|