瀏覽代碼

【BUG】解决安全计划删除工具接口报错问题

ZhaoMn 3 年之前
父節點
當前提交
6dc474a1d4

+ 2 - 2
railway-business/src/main/java/com/railway/business/safetool/service/impl/SecScheduledServiceImpl.java

@@ -14,6 +14,7 @@ import com.railway.common.utils.bean.BeanUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -24,8 +25,8 @@ import org.springframework.util.CollectionUtils;
  * @author lijie
  * @date 2021/12/04
  */
+@Slf4j
 @Service
-@Transactional(readOnly = true)
 public class SecScheduledServiceImpl implements ISecScheduledService {
 
   private final SecScheduledMapper secScheduledMapper;
@@ -122,7 +123,6 @@ public class SecScheduledServiceImpl implements ISecScheduledService {
   @Override
   @Transactional(rollbackFor = Exception.class)
   public int delTools(SecScheduledToolVo secScheduled) {
-
     if (secScheduledToolMapper.checkdel(secScheduled) != 1) {
       return secScheduledToolMapper.delete(secScheduled);
     } else {

+ 3 - 6
railway-business/src/main/resources/mapper/safetool/SecScheduledMapper.xml

@@ -121,12 +121,9 @@
   <select id="getList" resultMap="BaseResultMap2">
     select s.id,s.dept_id,s.lab_id,s.scheduled_time ,d1.dept_name deptName,d2.dept_name labName
     ,concat(count(1),'件') c
-    from
-    sec_scheduled s
-    left join sec_scheduled_tool r
-    on r.scheduled_id = s.id
-    inner join base_safety_tool t
-    on t.tool_id = r.tool_id
+    from sec_scheduled s
+    left join sec_scheduled_tool r on r.scheduled_id = s.id
+    inner join base_safety_tool t on t.tool_id = r.tool_id
     left join sys_dept d1 on s.dept_id = d1.dept_id
     left join sys_dept d2 on s.lab_id = d2.dept_id
     where s.del_flag = '0' and s.state = 0 and t.del_flag = '0' and t.state = '1'