新建专题库名称不重复的限制在本租户lrj 3/1

PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -104,7 +104,9 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
 
     public Project getProjectByName(String name) {
         LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
+        PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
         queryWrapper.eq(Project::getName, name);
+        queryWrapper.eq(Project::getTenantId,personnelVO.getTenantId());
         queryWrapper.last("limit 1");
         return this.getOne(queryWrapper);
     }
@@ -259,6 +261,9 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
                 item.setTypeName(systemDictList.stream().filter(systemDict -> systemDict.getType().equals(Constants.INVESTIGATION_TYPE) && item.getTypeList().contains(Integer.parseInt(systemDict.getValue()))).map(SystemDict::getLabel).collect(Collectors.toList()));
                 item.setType(null);
             }
+            else{
+                item.setTypeList(new ArrayList<Integer>());
+            }
         });
     }
 
@@ -409,7 +414,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         if (temp != null) {
             return Response.error("专题库名称已存在");
         }
-        if (project.getClientId() == -1) {
+        if (project.getClientId()==null||project.getClientId() == -1) {
             ClientDTO clientDTO = new ClientDTO();
             clientDTO.setName(project.getClientName());
             clientDTO.setTenantId(user.getTenantId());
@@ -434,7 +439,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         if (temp != null && !temp.getId().equals(project.getId())) {
             return Response.error("专题库名称已存在");
         }
-        if (project.getClientId() == -1) {
+        if (project.getClientId()==null||project.getClientId() == -1) {
             ClientDTO clientDTO = new ClientDTO();
             clientDTO.setName(project.getClientName());
             clientDTO.setTenantId(project.getTenantId());