Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-06 1f712d545d8cfd4e9dac74d22a67ebf599df1577

 ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java

@@ -242,7 +242,7 @@
        ArdEplan result = ardEplanService.selectArdEplanById(ids[0]);
        String userId = SecurityUtils.getUserId();
        SysUser sysUser = userService.selectUserById(userId);
        if(!result.getDeptId().equals(sysUser.getDeptId())){
        if(!result.getDeptId().equals(String.valueOf(sysUser.getDeptId()))){
            return toAjax(0);//非本部门预案无法删除
        }
        return toAjax(ardEplanService.deleteArdEplanByIds(ids));