浏览代码

检查库管理调试

jiawuxian 2 年之前
父节点
当前提交
f0bf24b582

+ 1 - 1
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleItemServiceImpl.java

@@ -177,7 +177,7 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
 
             Integer num1 = appRulePointMapper.checkIsJoinResumptionPlan(idList);
             if (ObjectUtil.isNotNull(num1)) {
-                throw new RuntimeException("该检查项已被检查计划或履职计划关联,请先删除检查计划或履职计划!");
+                throw new RuntimeException("该检查项已被履职计划关联!");
             }
         }
         appRuleItemMapper.deleteById(id);

+ 9 - 8
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -184,14 +184,15 @@ public class SafetyCheckRuleItemServiceImpl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean del(Long id) {
-        List<Long> idList = safetyCheckRulePointMapper.selectPointIds(id);
-        if (idList.size() > 0) {
-
-            Integer num1 = safetyCheckRulePointMapper.checkIsJoinResumptionPlan(idList);
-            if (ObjectUtil.isNotNull(num1)) {
-                throw new RuntimeException("该检查项已被检查计划或履职计划关联,请先删除检查计划或履职计划!");
-            }
-        }
+        //todo
+//        List<Long> idList = safetyCheckRulePointMapper.selectPointIds(id);
+//        if (idList.size() > 0) {
+//
+//            Integer num1 = safetyCheckRulePointMapper.checkIsJoinResumptionPlan(idList);
+//            if (ObjectUtil.isNotNull(num1)) {
+//                throw new RuntimeException("该检查项已被检查计划关联!");
+//            }
+//        }
         safetyCheckRuleItemMapper.deleteById(id);
         safetyCheckRulePointMapper.deleteByMap(MapUtil.of("item_id", id));
         return true;