问题处理

hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowProcessServiceImpl.java

@@ -261,21 +261,25 @@ public class FlowProcessServiceImpl implements FlowProcessService {
 
             // 结束流程
             case REJECT:
+                flowExampleCurrentService.remove(q -> q.eq(FlowExampleCurrent::getFlowExampleId, context.getFlowExample().getId()));
                 flowResult = reject(context);
                 break;
 
             // 返回上一节点
             case RETURN_TO_PREVIOUS:
+                flowExampleCurrentService.remove(q -> q.eq(FlowExampleCurrent::getFlowExampleId, context.getFlowExample().getId()));
                 flowResult = returnToPrevious(context);
                 break;
 
             // 退回到发起人
             case RETURN_TO_SUBMITTER:
+                flowExampleCurrentService.remove(q -> q.eq(FlowExampleCurrent::getFlowExampleId, context.getFlowExample().getId()));
                 flowResult = returnToSubmitter(context);
                 break;
 
             // 作废
             case CANCELLATION:
+                flowExampleCurrentService.remove(q -> q.eq(FlowExampleCurrent::getFlowExampleId, context.getFlowExample().getId()));
                 flowResult = cancellation(context);
                 break;
             //加签
@@ -290,6 +294,7 @@ public class FlowProcessServiceImpl implements FlowProcessService {
                 break;
             // 退回到指定节点
             case RETURN_TO_NODE:
+                flowExampleCurrentService.remove(q -> q.eq(FlowExampleCurrent::getFlowExampleId, context.getFlowExample().getId()));
                 flowResult = returnToNode(context, dto);
                 break;
 
@@ -1016,6 +1021,9 @@ public class FlowProcessServiceImpl implements FlowProcessService {
                     case  "10":
                        identityName =  "员工";
                     break;
+                    case  "15":
+                        identityName =  "组长";
+                        break;
                     case  "20":
                         identityName =  "主管";
                         break;

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

@@ -301,7 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				#{roleId}
 			</foreach>
 			<if test="companyId != null">
-				AND u.company_id = #{companyId}
+				AND (u.company_id = #{companyId} OR FIND_IN_SET(#{companyId}, u.company_set))
 			</if>
 		</where>
     </select>