入职流程完成

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -65,4 +65,8 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, Sy
      * @return
      */
     SysRole getCurrentRole(Long userId);
+
+    Long[] selectTempRoleByName();
+
+
 }

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

@@ -183,7 +183,7 @@ public interface ISysRoleService {
      *
      * @return
      */
-    Long[] selectRoleByName();
+    Long[] selectTempRoleByName();
 
 
     SysRole getCurrentRole();

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -442,8 +442,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
     }
 
     @Override
-    public Long[] selectRoleByName() {
-        return new Long[0];
+    public Long[] selectTempRoleByName() {
+
+        return  baseMapper.selectTempRoleByName();
     }
 
     @Override

ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java

@@ -313,9 +313,11 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
 
             //获取部门信息(新增于2024年2月29日)
             SysUser sysUser = sysUserService.selectUserById(userId);
-            SysDept sysDept = sysDeptService.selectDeptById(sysUser.getDeptId());
-            flowTask.setDeptName(sysDept.getDeptName());
+            if (sysUser.getDeptId()!=null){
+                SysDept sysDept = sysDeptService.selectDeptById(sysUser.getDeptId());
+                flowTask.setDeptName(sysDept.getDeptName());
 
+            }
             // 流程变量
             flowTask.setProcVars(task.getProcessVariables());