From 94ae02e6f73b7011f0fcf6acff8636341d35351d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 17:24:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/WorkerProcessServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/WorkerProcessServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/WorkerProcessServiceImpl.java
index 3030b2e..98e1f16 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/WorkerProcessServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/WorkerProcessServiceImpl.java
@@ -38,7 +38,7 @@
return R.fail("当前入驻申请已被审核！");
}
workerProcess.setState(state);
- workerProcess.setExamineOpinion(opinion);
+ workerProcess.setOpinion(opinion);
if (Constants.PASS_THROUGH_NUMBER.equals(state)) {
// 审核状态为 1 已通过时，生成登录账号
MasterWorker masterWorker = new MasterWorker();
@@ -56,6 +56,9 @@
String encodePassword = passwordEncoder.encode(Constants.DEFAULT_PASSWORD);
masterWorker.setPassword(encodePassword);
masterWorker.setUserNumber(Constants.DEFAULT_USER_NUMBER_PRE + RandomUtil.randomNumbers(10));
+ masterWorker.setCityStr(workerProcess.getCityStr());
+ masterWorker.setCityCode(workerProcess.getCityCode());
+ masterWorker.setProfilePicture(workerProcess.getProfilePicture());
masterWorkerService.save(masterWorker);
}
return updateById(workerProcess) ? R.ok() : R.fail("当前入驻申请审核失败！");
--
Gitblit v1.7.1