|
@@ -15,10 +15,7 @@ import com.fdkankan.site.entity.dto.MarkingDTO;
|
|
|
import com.fdkankan.site.entity.dto.UserDTO;
|
|
|
import com.fdkankan.site.mapper.IMarkingMapper;
|
|
|
import com.fdkankan.site.request.MarkingSearchParam;
|
|
|
-import com.fdkankan.site.service.IMarkingService;
|
|
|
-import com.fdkankan.site.service.IProjectLogService;
|
|
|
-import com.fdkankan.site.service.IMarkingUserService;
|
|
|
-import com.fdkankan.site.service.IProjectTeamService;
|
|
|
+import com.fdkankan.site.service.*;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -34,7 +31,8 @@ public class MarkingServiceImpl extends ServiceImpl<IMarkingMapper, Marking> imp
|
|
|
IMarkingUserService markingUserService;
|
|
|
@Autowired
|
|
|
IProjectTeamService projectTeamService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ IProjectService projectService;
|
|
|
|
|
|
@Override
|
|
|
public Object pageList(MarkingSearchParam param) {
|
|
@@ -87,7 +85,9 @@ public class MarkingServiceImpl extends ServiceImpl<IMarkingMapper, Marking> imp
|
|
|
|
|
|
@Override
|
|
|
public void delMarking(Integer markingId,String token) {
|
|
|
+
|
|
|
Marking marking = getById(markingId);
|
|
|
+ projectService.checkTokenPer(token, marking.getProjectId());
|
|
|
if (Optional.ofNullable(marking).isPresent()) {
|
|
|
LambdaUpdateWrapper<Marking> wrapper = new LambdaUpdateWrapper<>();
|
|
|
wrapper.eq(Marking::getMarkingId, markingId);
|