bestunion/SY
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2025-12-18

Browse Source
This commit is contained in:
yhy 2026-02-05 15:15:29 +08:00
parent 4093cddd6b
commit c78f6c8edd
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -278,7 +278,7 @@ public class SysUserController extends BaseController
}
else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
{
return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在,如账号已删除请重新激活");
return error("修改用户'" + user.getUserName() + "'失败，人员编号已存在,如账号已删除请重新激活");
}
if (StringUtils.isNotEmpty(user.getIdentityCard()) && !userService.checkIdentityCardUnique(user))
{
@ -292,7 +292,7 @@ public class SysUserController extends BaseController
user.setCurDepId(user.getDeptId());
user.setCurUnitId(user.getUnitId());
return toAjax(userService.updateUserInfo(user));
return toAjax(userService.updateUser(user));
}
@ApiOperation("拉取完用户照片修改状态（安卓用）")

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
# url: jdbc:dm://192.168.0.151:5236?schema=SY
url: jdbc:dm://192.168.0.151:5236?schema=SY
# url: jdbc:dm://172.16.1.97:5236?schema=SY
url: jdbc:dm://localhost:5236?schema=SY
# url: jdbc:dm://localhost:5236?schema=SY
username: SYSDBA
# password: jm@61020900
password: jsjcy@123

14
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -135,6 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="pullState != null and pullState != ''">
AND u.pullState = #{pullState}
</if>
<if test="email != null and email != ''">
AND u.email = #{email,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
@ -153,6 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber = #{phonenumber,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler}
</if>
<if test="email != null and email != ''">
AND u.email = #{email,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
@ -172,6 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber = #{phonenumber,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler}
</if>
<if test="email != null and email != ''">
AND u.email = #{email,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
@ -249,7 +258,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="userType != null and userType != ''">user_type = #{userType},</if>
<if test="email != null and email != ''">email = #{email,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler},</if>
<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler},</if>
<if test="email == null">email = null,</if>
<if test="phonenumber != null and phonenumber != ''">phonenumber = #{phonenumber,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler},</if>
<if test="phonenumber == null">phonenumber = null,</if>
<if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
<if test="signPath != null and signPath != ''">sign_path = #{signPath},</if>
@ -263,6 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="identityCard != null and identityCard != ''" >identity_card = #{identityCard,typeHandler=com.ruoyi.common.utils.EncryptTypeHandler},</if>
<if test="identityCard == null" >identity_card = null,</if>
<if test="digitalTelephoneNumber != null and digitalTelephoneNumber != ''">digital_telephone_number = #{digitalTelephoneNumber},</if>
<if test="digitalTelephoneNumber == null">digital_telephone_number = null,</if>
<if test="remark != null">remark = #{remark},</if>
update_time = sysdate()
</set>