入职流程完成

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

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
 
-    <resultMap type="SysRole" id="SysRoleResult">
+    <resultMap type="com.ruoyi.common.core.domain.entity.SysRole" id="SysRoleResult">
         <id property="roleId" column="role_id"/>
         <result property="roleName" column="role_name"/>
         <result property="roleKey" column="role_key"/>
@@ -76,5 +76,8 @@
                  join sys_user_role sur on sur.role_id = r.role_id
         where #{userId}  = sur.user_id
     </select>
+    <select id="selectTempRoleByName" resultType="Long">
+        select r.role_id from sys_role r where r.role_key = 'temp'
+    </select>
 
 </mapper>