From 1e404a53eb6417bda095918d4667e07b882cd4ff Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Wed, 5 Nov 2025 13:16:11 +0800
Subject: [PATCH] =?UTF-8?q?app=5Fuser=20=E6=B7=BB=E5=8A=A0ytjPassword?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java   | 4 ++++
 .../src/main/resources/mapper/app/AppUserMapper.xml           | 2 ++
 .../java/com/ruoyi/common/core/domain/entity/AppUser.java     | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
index 318e017..d64d19d 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
@@ -219,6 +219,10 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
         //保存sys_user_role
         mapUserRole.put("userId",sysUser.getUserId());
         appUserMapper.insertSysUserRole(mapUserRole);
+        //一体机密码
+        if(StringUtils.isNotEmpty(appUser.getYtjPassword())){
+            appUser.setYtjPassword(SiteSecurityUtils.encryptPassword(appUser.getYtjPassword()));
+        }
         appUserMapper.updateById(appUser);
         return appUser;
     }
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
index a6a5ef0..5680cc4 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
@@ -89,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="remark != null and remark != ''">remark,</if>
         <if test="idCard != null and idCard != ''">id_card,</if>
+        <if test="ytjPassword != null and ytjPassword != ''">ytj_password,</if>
         create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -104,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
         <if test="idCard != null and idCard != ''">#{idCard},</if>
+        <if test="ytjPassword != null and ytjPassword != ''">#{ytjPassword},</if>
         sysdate()
         )
     </insert>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
index e44acca..bc1902b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java
@@ -149,4 +149,7 @@ public class AppUser extends BaseEntity
 
     @TableField(exist = false)
     private MyChart myChart;
+
+    @ApiModelProperty("一体机密码")
+    private String ytjPassword;
 }