Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmProjectServiceImpl.java

@@ -174,7 +174,7 @@ public class PmProjectServiceImpl extends AbstractCrudService<PmProjectMapper, P
                 lambdaQuery.eq(PmProject::getProjectHead, userId);
                 break;
             case 2:
-                lambdaQuery.apply(FIND_IN_SET_SQL, userId);
+                lambdaQuery.apply("FIND_IN_SET('" + userId + "', project_member) > 0");
                 break;
             default:
                 throw new BusinessException("查询项目列表参数错误");

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkContentServiceImpl.java

@@ -234,6 +234,9 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         workContentList = pmWorkContentMapper.selectList(contentLambdaQuery);
 
         List<Integer> workContentIds = workContentList.stream().map(PmWorkContent::getProjectId).distinct().collect(Collectors.toList());
+        if (workContentIds.isEmpty()){
+            return workContentList;
+        }
         LambdaQueryWrapper<PmProject> projectQuery = Wrappers.lambdaQuery();
         projectQuery.select(PmProject::getId, PmProject::getProjectName).in(PmProject::getId, workContentIds);
         Map<Integer, String> projectNameMap = pmProjectMapper.selectList(projectQuery).stream().collect(Collectors.toMap(PmProject::getId, PmProject::getProjectName));