diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 348bbc9..a8dbccc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -223,6 +223,21 @@ public class SysUserController extends BaseController
return toAjax(userService.deleteUserByIds(userIds));
}
+ /**
+ * 根据考核任务id删除用户
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:remove')")
+ @Log(title = "用户管理", businessType = BusinessType.DELETE)
+ @DeleteMapping("/pcIds/{pcIds}")
+ public AjaxResult removeBypcIds(@PathVariable Long[] pcIds)
+ {
+ if (ArrayUtils.contains(pcIds, getUserId()))
+ {
+ return error("当前用户不能删除");
+ }
+ return toAjax(userService.deleteUserByPcIds(pcIds));
+ }
+
/**
* 重置密码
*/
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhTemItemMapper.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhTemItemMapper.java
index ebe7827..8142446 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhTemItemMapper.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/mapper/KhTemItemMapper.java
@@ -58,4 +58,6 @@ public interface KhTemItemMapper
* @return 结果
*/
public int deleteKhTemItemByIds(Long[] ids);
+
+ int deleteKhTemItemByTemIds(Long[] temIds);
}
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhTemplateServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhTemplateServiceImpl.java
index af1bae9..454d862 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhTemplateServiceImpl.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhTemplateServiceImpl.java
@@ -1,11 +1,14 @@
package com.ruoyi.kaohe.service.impl;
import java.util.List;
+
+import com.ruoyi.kaohe.mapper.KhTemItemMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.kaohe.mapper.KhTemplateMapper;
import com.ruoyi.kaohe.domain.KhTemplate;
import com.ruoyi.kaohe.service.IKhTemplateService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 考核模板Service业务层处理
@@ -18,6 +21,8 @@ public class KhTemplateServiceImpl implements IKhTemplateService
{
@Autowired
private KhTemplateMapper khTemplateMapper;
+ @Autowired
+ private KhTemItemMapper khTemItemMapper;
/**
* 查询考核模板
@@ -74,9 +79,14 @@ public class KhTemplateServiceImpl implements IKhTemplateService
* @return 结果
*/
@Override
+ @Transactional
public int deleteKhTemplateByIds(Long[] ids)
{
- return khTemplateMapper.deleteKhTemplateByIds(ids);
+ int i=khTemplateMapper.deleteKhTemplateByIds(ids);
+ if(i>0){
+ khTemItemMapper.deleteKhTemItemByTemIds(ids);
+ }
+ return i;
}
/**
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml
index 48dff6a..ba07f34 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml
@@ -78,4 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
+
+ delete from kh_tem_item where tem_id in
+
+ #{temId}
+
+
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 7a5b679..54ddaed 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -203,4 +203,6 @@ public interface ISysUserService
* @return 结果
*/
public String importUser(List userList, Boolean isUpdateSupport, String operName);
+
+ int deleteUserByPcIds(Long[] pcIds);
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index f3a4dca..feb170a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -237,5 +237,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{userId}
-
+
+ update sys_user set del_flag = '2' where pc_id in
+
+ #{pcId}
+
+
+
\ No newline at end of file