‘linchangsheng’ 5 mesi fa
parent
commit
d1b6f809ad

+ 3 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -606,6 +606,9 @@ public class AdminUserLogic {
                 .eq(status != null, AdminUser::getStatus, status)
                 .like(StringUtils.isNotBlank(userName), AdminUser::getUserName, userName)
                 .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()), AdminUser::getCompanyWechatId, adminUser.getCompanyWechatIds())
+                .and(!CollectionUtils.isNotEmpty(adminUserIds),item -> item.in( AdminUser::getAdminUserId, adminUserIds)
+                .ne(AdminUser::getUserName,"admin")
+                )
                 .and(adminUser.getIsMaster() && adminUser.getType() == 0, v -> v.eq(AdminUser::getAdminUserId, adminUser.getAdminUserId())
                         .or()
                         .in(AdminUser::getMasterWebsitId, adminUser.getAdminWebsitIds()))

BIN
mall-server-api/src/main/resources/template/科室人员导入模版.xlsx