1、证书编号查重改为企业内
parent
a4e53d24f2
commit
fa1b7ad6ae
|
|
@ -80,8 +80,13 @@ public class CorpCertificateQueryExe {
|
||||||
* 判断证书编号是否存在
|
* 判断证书编号是否存在
|
||||||
*/
|
*/
|
||||||
public boolean checkCertNoExist(String certNo, Long id) {
|
public boolean checkCertNoExist(String certNo, Long id) {
|
||||||
|
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||||
|
if (ssoUser == null || ssoUser.getTenantId() == null || certNo == null || certNo.trim().isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return corpCertificateRepository.count(new LambdaQueryWrapper<CorpCertificateDO>()
|
return corpCertificateRepository.count(new LambdaQueryWrapper<CorpCertificateDO>()
|
||||||
.eq(CorpCertificateDO::getCertificateCode, certNo)
|
.eq(CorpCertificateDO::getCertificateCode, certNo)
|
||||||
|
.eq(CorpCertificateDO::getCorpinfoId, ssoUser.getTenantId())
|
||||||
.ne(id != null, CorpCertificateDO::getId, id)
|
.ne(id != null, CorpCertificateDO::getId, id)
|
||||||
) > 0;
|
) > 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -133,8 +133,13 @@ public class UserCertificateQueryExe {
|
||||||
* 查询证书编号是否存在
|
* 查询证书编号是否存在
|
||||||
*/
|
*/
|
||||||
public boolean checkCertNoExist(String certNo, Long id) {
|
public boolean checkCertNoExist(String certNo, Long id) {
|
||||||
|
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||||
|
if (ssoUser == null || ssoUser.getTenantId() == null || certNo == null || certNo.trim().isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
return userCertificateRepository.count(new LambdaQueryWrapper<UserCertificateDO>()
|
return userCertificateRepository.count(new LambdaQueryWrapper<UserCertificateDO>()
|
||||||
.eq(UserCertificateDO::getCertificateCode, certNo)
|
.eq(UserCertificateDO::getCertificateCode, certNo)
|
||||||
|
.eq(UserCertificateDO::getCorpinfoId, ssoUser.getTenantId())
|
||||||
.ne(id != null, UserCertificateDO::getId, id)
|
.ne(id != null, UserCertificateDO::getId, id)
|
||||||
) > 0;
|
) > 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,15 @@
|
||||||
department d ON d.id = u.department_id
|
department d ON d.id = u.department_id
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
post p ON p.id = u.post_id
|
post p ON p.id = u.post_id
|
||||||
WHERE 1=1
|
WHERE
|
||||||
AND uc.delete_enum = 'false'
|
uc.delete_enum = 'false'
|
||||||
|
|
||||||
|
<if test="params.eqType != null and params.eqType != ''">
|
||||||
|
AND uc.type = #{params.eqType}
|
||||||
|
</if>
|
||||||
|
<if test="params.eqCorpinfoId != null and params.eqCorpinfoId != ''">
|
||||||
|
AND uc.corpinfo_id = #{params.eqCorpinfoId}
|
||||||
|
</if>
|
||||||
<if test="params.tenantId != null">
|
<if test="params.tenantId != null">
|
||||||
AND uc.tenant_id = #{params.tenantId}
|
AND uc.tenant_id = #{params.tenantId}
|
||||||
</if>
|
</if>
|
||||||
|
|
@ -46,12 +53,6 @@
|
||||||
<if test="params.eqAssignmentOperatingItemsCode != null and params.eqAssignmentOperatingItemsCode != ''">
|
<if test="params.eqAssignmentOperatingItemsCode != null and params.eqAssignmentOperatingItemsCode != ''">
|
||||||
AND uc.assignment_operating_items_code = #{params.eqAssignmentOperatingItemsCode}
|
AND uc.assignment_operating_items_code = #{params.eqAssignmentOperatingItemsCode}
|
||||||
</if>
|
</if>
|
||||||
<if test="params.eqType != null and params.eqType != ''">
|
|
||||||
AND uc.type = #{params.eqType}
|
|
||||||
</if>
|
|
||||||
<if test="params.eqCorpinfoId != null and params.eqCorpinfoId != ''">
|
|
||||||
AND uc.corpinfo_id = #{params.eqCorpinfoId}
|
|
||||||
</if>
|
|
||||||
<if test="params.likePostName != null and params.likePostName != ''">
|
<if test="params.likePostName != null and params.likePostName != ''">
|
||||||
AND uc.post_name LIKE CONCAT('%', #{params.likePostName}, '%')
|
AND uc.post_name LIKE CONCAT('%', #{params.likePostName}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
|
@ -80,8 +81,8 @@
|
||||||
department d ON d.id = u.department_id
|
department d ON d.id = u.department_id
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
post p ON p.id = u.post_id
|
post p ON p.id = u.post_id
|
||||||
WHERE 1=1
|
WHERE
|
||||||
AND uc.delete_enum = 'false'
|
uc.delete_enum = 'false'
|
||||||
<if test="params.tenantId != null">
|
<if test="params.tenantId != null">
|
||||||
AND uc.tenant_id = #{params.tenantId}
|
AND uc.tenant_id = #{params.tenantId}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue