From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期三, 21 五月 2025 09:14:11 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java index 41d302c..8b6988b 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java +++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java @@ -1,15 +1,14 @@ package com.doumee.service.business.impl; import com.doumee.biz.system.SystemDictDataBiz; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.core.wx.MeetConstants; 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,6 +40,7 @@ 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()); @@ -180,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+" ") ); } } -- Gitblit v1.9.3