Merge remote-tracking branch 'origin/main'

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));
+    }
+
     /**
      * 重置密码
      */

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);
 }

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;
     }
 
     /**

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml

@@ -78,4 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteKhTemItemByTemIds" parameterType="String">
+        delete from kh_tem_item where tem_id in
+        <foreach item="temId" collection="array" open="(" separator="," close=")">
+            #{temId}
+        </foreach>
+    </delete>
 </mapper>

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -203,4 +203,6 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    int deleteUserByPcIds(Long[] pcIds);
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -237,5 +237,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			#{userId}
         </foreach> 
  	</delete>
+ 	<delete id="deleteUserByPcIds" parameterType="Long">
+ 		update sys_user set del_flag = '2' where pc_id in
+ 		<foreach collection="array" item="pcId" open="(" separator="," close=")">
+ 			#{pcId}
+        </foreach>
+ 	</delete>
 
 </mapper>