Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency

chenrui

2025-04-03 deb25b1c56eafc4a8a9fc293b7807baad99e216c

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java

@@ -183,6 +183,7 @@
                user.setIsCustom(0);
                user.setPassword(SecurityUtils.encryptPassword("zttZTT123!"));
                user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
                user.setDeptId(personDto.getDeptId());
                userMapper.insert(user);
            } else {
                user.setName(person.getName());
@@ -190,6 +191,7 @@
                user.setEmail(person.getCompanyEmail());
                user.setIsCustom(0);
                user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
                user.setDeptId(personDto.getDeptId());
                userMapper.updateById(user);
            }
        });