Merge remote-tracking branch 'origin/master'

jiangping

2024-08-09 249a271a867df4802a8d59371e0ff10d3eb54298

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java

@@ -9,7 +9,6 @@
import com.doumee.dao.business.ProjectsMapper;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
import com.doumee.dao.web.response.UserResponse;
import com.doumee.service.business.ProjectsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -41,12 +40,14 @@
    public Integer create(Projects projects) {

        Projects insert = new Projects();
        insert.setIsdeleted(Constants.ZERO);
        insert.setCreator(projects.getCreator());
        insert.setEditor(projects.getEditor());
        insert.setName(projects.getName());
        insert.setImgurl(projects.getImgurl());
        insert.setStatus(MeetConstants.ZERO);
        insert.setSortnum(projects.getSortnum());
        insert.setCreateDate(new Date());
        projectsMapper.insert(insert);
        return projects.getId();
    }
@@ -179,7 +180,7 @@
    public List<ProjectsResponse> getProjectsList(Integer objId,Integer objType) {
        return projectsMapper.getProjectsList(new QueryWrapper<ProjectsResponse>()
                        .eq("ISDELETED",MeetConstants.ZERO)
                .exists(" select 1 from project_rel p where p.PROJECT_ID = projects.id and p.OBJ_ID = "+objId+" and p.OBJ_TYPE = "+objType+"  ")
                .exists(" select 1 from meeting_project_rel p where p.PROJECT_ID = meeting_projects.id and p.OBJ_ID = "+objId+" and p.OBJ_TYPE = "+objType+"  ")
        );
    }
}