知识库人员筛选条件调整

src/main/java/com/jeeplus/modules/WorkKnowledgeBase/web/WorkKnowledgeBasePointController.java

@@ -105,19 +105,9 @@ public class WorkKnowledgeBasePointController extends BaseController {
             }
         }
         //判断经办人是否为空，为空则赋值为null 防止查找为空的数据
-        String userId = null;
-        String userName = null;
         if (StringUtils.isBlank(workKnowledgeBasePoint.getSubmitterName())) {
             workKnowledgeBasePoint.setSubmitterName(null);
             workKnowledgeBasePoint.setSubmitterId(null);
-        } else {
-            //如果ID和名称都有值，说明是通过选择器选的精确查询
-            if (StringUtils.isNotBlank(workKnowledgeBasePoint.getSubmitterId())) {
-                userId = workKnowledgeBasePoint.getSubmitterId();
-            } else {
-                //如果经办人名称有值但ID为空，说明是手动输入的模糊查询
-                userName = workKnowledgeBasePoint.getSubmitterName();
-            }
         }
 
         User user = UserUtils.getUser();

src/main/resources/mappings/modules/WorkKnowledgeBase/WorkKnowledgeBasePointDetailDao.xml

@@ -153,6 +153,9 @@
             <if test="userName != null and userName != ''">
                 AND u.name LIKE CONCAT('%', #{userName}, '%')
             </if>
+            <if test="(submitterName != null and submitterName != '') or (submitterId != null and submitterId != '')">
+                AND (u.id = #{submitterId} OR u.name LIKE CONCAT('%', #{submitterName}, '%'))
+            </if>
             <if test="officeId == '' and officeName!=null and officeName!=''">
                 AND o.name like concat('%',#{officeName},'%')
             </if>
@@ -211,6 +214,9 @@
                 <if test="userName != null and userName != ''">
                     AND u.name LIKE CONCAT('%', #{userName}, '%')
                 </if>
+                <if test="(submitterName != null and submitterName != '') or (submitterId != null and submitterId != '')">
+                    AND (u.id = #{submitterId} OR u.name LIKE CONCAT('%', #{submitterName}, '%'))
+                </if>
 
                 <if test="officeId == '' and officeName!=null and officeName!=''">
                     AND o.name like concat('%',#{officeName},'%')