lwhhszx 1 год назад
Родитель
Сommit
a0d29b51d3
1 измененных файлов с 17 добавлено и 2 удалено
  1. 17 2
      PCS/src/main/java/cn/cslg/permission/service/ClientService.java

+ 17 - 2
PCS/src/main/java/cn/cslg/permission/service/ClientService.java

@@ -5,6 +5,7 @@ import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.*;
 import cn.cslg.permission.domain.Client;
 import cn.cslg.permission.domain.Personnel;
+import cn.cslg.permission.domain.Tenant;
 import cn.cslg.permission.mapper.ClientMapper;
 import cn.cslg.permission.service.associate.AssoTenantClientService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -37,7 +38,7 @@ public class ClientService extends ServiceImpl<ClientMapper, Client> {
     private final PersonnelService personnelService;
     private final AssoTenantClientService assoTenantClientService;
     private final CacheUtils cacheUtils;
-
+    private final TenantService tenantService;
     /**
      * @param params
      * @return
@@ -205,8 +206,22 @@ public class ClientService extends ServiceImpl<ClientMapper, Client> {
             PersonnelVO personnel = cacheUtils.getLoginUser(loginUtils.getId());
             params.setTenantId(personnel.getTenantId());
         }
+        List<Client> list = new ArrayList<>();
+Tenant tenant =tenantService.getById(params.getTenantId());
+        {
+            if(tenant!=null){
+                Client client =new Client();
+                client.setName(tenant.getTenantName());
+                client.setTenantId(tenant.getId());
+                client.setCreateUser(tenant.getCreateUser());
+                client.setIsDelete(0);
+                client.setStatus(1);
+                list.add(client);
+            }
+        }
+
         IPage<Client> lst = this.baseMapper.getTenantClients(new Page<>(params.getCurrent(), params.getSize()), params);
-        List<Client> list = lst.getRecords();
+        list.addAll(lst.getRecords());
         this.loadClient(list);
         lst.setRecords(list);
         return lst;