From c0f0a6b96ada978272f0e4fa76cf1b2a143e249c Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 22 May 2024 14:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SystemUserController.java | 10 +- .../modules/basicdata/entity/SystemUser.java | 10 +- .../basicdata/mapper/SystemUserMapper.java | 4 +- .../basicdata/mapper/xml/SystemUserMapper.xml | 109 ++++++++++++------ .../basicdata/service/ISystemUserService.java | 2 + .../service/impl/SystemUserServiceImpl.java | 14 ++- 6 files changed, 94 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java index cf74a2c38..b068f86d2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java @@ -117,15 +117,7 @@ public class SystemUserController { @ApiImplicitParam(name = "id", value = "账号ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/queryById") public Result queryById(@RequestBody Map map) { - Result result = new Result(); - SystemUser systemUser = systemUserService.getById(MapUtils.getString(map, "id")); - if (systemUser == null) { - result.error500(MessageUtil.get("notFindErr")); - } else { - result.setResult(systemUser); - result.setSuccess(true); - } - return result; + return Result.success(systemUserService.queryById(map)); } @OperLog(operModul = "账号管理", operType = "修改用户密码", operDesc = "修改用户密码") diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java index b31afb598..9c33d3357 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java @@ -138,6 +138,11 @@ public class SystemUser implements Serializable { private Long xzProjectOrgId; @ApiModelProperty(value = "星纵-项目组织机构对象") private String xzProjectOrgObj; + @ApiModelProperty(value = "性别，1男，2女") + private java.lang.Integer sex; + + @ApiModelProperty(value = "邮箱") + private java.lang.String personMail; @TableField(exist = false) @ApiModelProperty(value = "角色ID") @@ -174,6 +179,7 @@ public class SystemUser implements Serializable { private java.lang.String graphValidateCodeUuid; @TableField(exist = false) + @ApiModelProperty(value = "新用户或供应商的注册邮箱") private java.lang.String email; @TableField(exist = false) @@ -191,10 +197,8 @@ public class SystemUser implements Serializable { @TableField(exist = false) private java.lang.Long enterpriseId; - @TableField(exist = false) - @ApiModelProperty(value = "邮箱") - private java.lang.String personMail; @TableField(exist = false) @ApiModelProperty(value = "默认1，通过邮箱验证，0则不通过邮箱验证") private java.lang.Integer isCheckCode; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java index 7e6b96f07..cf7dcb774 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java @@ -47,7 +47,7 @@ public interface SystemUserMapper extends BaseMapper { List getSecondComapnyProjectSystemUserList(Map map); @DataScope(includeTable = "enterprise_info") - List getProjectChilderSystemUserList(Map map); + List getProjectChilderSystemUserList(@Param("param") Map map); List selectUserNameList(@Param("inspectUser") String inspectUser); @@ -112,4 +112,6 @@ public interface SystemUserMapper extends BaseMapper { Page getTenantListBySn(@Param("map") Map map, Page page); List getUsersByRegionId(Long id); + + SystemUser queryById(@Param("param") Map map); } 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 50dd3dc32..1a612a4b4 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 @@ -1,6 +1,61 @@ + + and t.sn = #{param.projectSn} + and t.account_type = 6 + + + + and t.user_id = #{param.userId} + + + and t.user_id = #{param.id} + + + and d.worker_name like CONCAT(CONCAT('%', #{param.workerName}), '%') + + + and d.id = #{param.workerId} + + + and d.enterprise_id in + + #{param.item} + + + + and pe.enterprise_type_id = #{param.enterpriseTypeId} + + + and xpo.id = #{param.xzProjectOrgId} + + + + 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, + t.*, + c.role_name, + d.worker_name, + b.role_id, + po.dept_name as projectOrgName, + d.enterprise_id, + d.person_mail + from system_user t + LEFT JOIN base_role_user b ON t.user_id = b.user_id + LEFT JOIN base_role c ON c.role_id = b.role_id + LEFT JOIN worker_info d ON t.worker_id = d.id + LEFT JOIN xz_project_org po on po.id=t.xz_project_org_id + 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 + + 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/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java index 561b2ef58..2b1cead6b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java @@ -126,4 +126,6 @@ public interface ISystemUserService extends IService { * 查找项目子账号列表 */ List getProjectChilderSystemUserList(Map map); + + SystemUser queryById(Map map); } 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 b775b086e..81499517d 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 @@ -818,6 +818,11 @@ public class SystemUserServiceImpl extends ServiceImpl map) { + return baseMapper.queryById(map); + } + @Override public void addProjectUser(SystemUser systemUser) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -1443,7 +1448,7 @@ public class SystemUserServiceImpl extends ServiceImpl workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper() .eq(WorkerInfo::getIdCard, idCard) - .eq(WorkerInfo::getWorkerName, name) .eq(StrUtil.isNotBlank(projectSn), WorkerInfo::getProjectSn, projectSn) ); - if (CollUtil.isEmpty(workerInfos)) { - return null; + if (CollUtil.isEmpty(workerInfos) || workerInfos.stream().anyMatch(workerInfo -> workerInfo.getInserviceType() != 1)) { + throw new OpenAlertException("身份证号不存在"); } for (WorkerInfo dev : workerInfos) { if (!dev.getWorkerName().equals(name)) { - throw new OpenAlertException("人员姓名错误"); + throw new OpenAlertException("身份证号和人员姓名不匹配"); } } return workerInfos.get(0);