任务标题，人员多条件查询

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -138,6 +138,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Resource
     private ICmcOutsourceService cmcOutsourceService;
     @Resource
+    private ICmcPerformanceService cmcPerformanceService;
+    @Resource
     private ICmcBudgetService cmcBudgetService;
     @Resource
     private FlowVarInstMapper flowVarInstMapper;
@@ -1634,6 +1636,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             CmcDeposit cmcDeposit = cmcDepositService.selectCmcDepositByDepositId(formId);
             projectId = cmcDeposit != null ? cmcDeposit.getTenderId().toString() : "";
         }
+        if (flowTaskDto.getProcDefName().equals("项目委外")) {
+            CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsoureId(formId);
+            projectId = cmcOutsource != null ? cmcOutsource.getProjectId() : "";
+            if (projectId == null)
+                flowTaskDto.setTitle(cmcOutsource.getApplyReason());
+        }
         if (projectId != null && !projectId.equals("")){
             if (flowTaskDto.getProcDefName().equals("保证金审批"))
                 flowTaskDto.setTitle(cmcTenderService.selectCmcTenderByTenderId(projectId).getProjectName());
@@ -1659,11 +1667,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (cmcProcureApproval != null)
                 flowTaskDto.setTitle(cmcProcureApproval.getApplyReason());
         }
-        if (flowTaskDto.getProcDefName().equals("项目委外")) {
-            CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsoureId(formId);
-            projectId = cmcOutsource != null ? cmcOutsource.getProjectId() : "";
-            if (projectId == null)
-                flowTaskDto.setTitle(cmcOutsource.getApplyReason());
+        if (flowTaskDto.getProcDefName().equals("绩效审批")) {
+            CmcPerformance cmcPerformance = cmcPerformanceService.selectCmcPerformanceByPerformanceId(formId);
+            if (cmcPerformance != null)
+                flowTaskDto.setTitle(cmcPerformance.getRemark());
         }
     }
 }

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

@@ -122,10 +122,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND find_in_set(#{titles}, u.titles)
 		</if>
 		<if test="certificates != null and certificates != ''">
-			AND find_in_set(#{certificates}, u.certificates})
+			AND find_in_set(#{certificates}, u.certificates)
 		</if>
 		<if test="politicalAffiliation != null and politicalAffiliation != ''">
-			AND find_in_set(#{politicalAffiliation}, u.political_affiliation})
+			AND find_in_set(#{politicalAffiliation}, u.political_affiliation)
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')