Merge remote-tracking branch 'origin/master'

陈昶聿

5 天以前 8107dedd85ceec29491293d8ebf69f7d7213aa6b

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -325,7 +325,7 @@
                        SysUser sysUser = new SysUser();
                        SysUser sysUserVo = new SysUser();
                        sysUserVo.setUserCode(dutyDeptPersonCode);
//                        sysUserVo.setOrgid(serviceSubtaskDetailTrace.getOrgid());
                        sysUserVo.setOrgid(serviceSubtaskDetailTrace.getOrgid());
                        List<SysUser> users = userService.getUserList(sysUserVo);
                        String phoneNumber = "";
                        if(ObjectUtils.isNotEmpty(users)){