From 7f0d164d4cf32bb91df333af03335b5f1e285038 Mon Sep 17 00:00:00 2001 From: lijun Date: Tue, 1 Oct 2024 23:55:58 +0800 Subject: [PATCH] update code --- .../ProProjectInfoSubdeptsUsersMapper.xml | 2 + .../proProjectInfoSubdeptsUsers/index.vue | 328 +++++++++--------- 2 files changed, 168 insertions(+), 162 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index cdedab45..77315efb 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -78,7 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and psu.sub_dept_name like concat('%', #{subDeptName}, '%') and psu.user_id = #{userId} and psu.user_name like concat('%', #{userName}, '%') + and psu.user_phone like concat('%', #{userPhone}, '%') and psu.craft_type = #{craftType} + and psu.sub_dept_group = #{subDeptGroup} and psu.craft_post = #{craftPost} and psu.edu_status = #{eduStatus} and psu.approve_status = #{approveStatus} diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue index df564c96..d3bb8d55 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue @@ -1,20 +1,22 @@