diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml index 65cd21f97..48f0099de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml @@ -35,7 +35,9 @@ SELECT t.worker_id as id, if(t.account_type=6,d.worker_name,t.real_name) as real_name, if(t.account_type=6,d.sex,t.sex) as sex, - if(t.account_type=6,d.person_mail,t.person_mail) as person_mail, + if(t.account_type=6,d.phone_number,t.user_tel) as user_tel, + CASE WHEN t.account_type=6 THEN d.person_mail WHEN t.account_type=10 or t.account_type=11 THEN xr.email ELSE + t.person_mail END as person_mail, t.*, c.role_name, d.worker_name, @@ -51,6 +53,7 @@ LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=t.sn left join xz_project_org xpo on xpo.id=t.xz_project_org_id + left join xz_registry xr on xr.account = t.account and xr.approval_process = 2 JOIN quality_region_to_user qrtu on ei.id = qrtu.enterprise_id and t.user_id=qrtu.user_id and qrtu.quality_region_id = #{param.qualityRegionId} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 81499517d..f3e97f617 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -298,6 +299,7 @@ public class SystemUserServiceImpl extends ServiceImpl() .eq(XzSystemUserToCompanyProject::getType, 2) @@ -419,6 +421,7 @@ public class SystemUserServiceImpl extends ServiceImpl() .eq(XzSystemUserToCompanyProject::getType, 2) @@ -790,6 +793,23 @@ public class SystemUserServiceImpl extends ServiceImpl() + .set(XzRegistry::getEmail, systemUser.getPersonMail()) + .eq(XzRegistry::getAccount, systemUser.getAccount()) + .eq(XzRegistry::getApprovalProcess, 2) + ); + } + }