From 1d0ea387063d7b9d28ea66123c66dde7eb0d95e0 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Thu, 16 Apr 2026 09:44:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(usermachine):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=BA=E5=8F=B0=E8=A1=A8=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=B9=B6=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserMachineServiceImpl.java     |  7 +++++++
 .../src/views/example/usermachine/form.vue       | 16 ++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java
index fef1ec8..7054da6 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java
@@ -101,6 +101,13 @@ public class UserMachineServiceImpl extends ServiceImpl<UserMachineMapper, UserM
     public void saveOrUpdate(UserMachineForm userMachineForm, String id, boolean isSave) throws Exception {
         UserMachineEntity entity;
         if (isSave) {
+            // 根据userId 判断是否已经存在记录
+            UserMachineEntity existingEntity = this.getOne(new LambdaQueryWrapper<UserMachineEntity>()
+                    .eq(UserMachineEntity::getUserId, userMachineForm.getUserId())
+                    .eq(UserMachineEntity::getDeleteMark, 0));
+            if (existingEntity != null) {
+                throw new Exception("该人员已配置机台班组，不能重复配置");
+            }
             entity = new UserMachineEntity();
             BeanUtils.copyProperties(userMachineForm, entity);
             entity.setId(null);
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/usermachine/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/usermachine/form.vue
index c332e9c..633a0f8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/usermachine/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/usermachine/form.vue
@@ -11,12 +11,16 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="人员" prop="userId">
-              <UserSelect 
-                v-model="dataForm.userId" 
-                @change="handleUserChange" 
-                placeholder="请选择人员"
-                :disabled="!!dataForm.id"
-              ></UserSelect>
+              <template v-if="dataForm.id">
+                <el-input v-model="dataForm.userName" disabled style="width: 100%;" />
+              </template>
+              <template v-else>
+                <UserSelect 
+                  v-model="dataForm.userId" 
+                  @change="handleUserChange" 
+                  placeholder="请选择人员"
+                ></UserSelect>
+              </template>
             </el-form-item>
           </el-col>
           <el-col :span="8">

From eb103439b966b375332d6d7943d8c22f1a5b8f82 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Thu, 16 Apr 2026 09:50:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(user-machine):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=BA=E5=8F=B0=E9=85=8D=E7=BD=AE=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=A3=80=E6=9F=A5=E5=92=8C=E9=94=99=E8=AF=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/jnpf/service/impl/UserMachineServiceImpl.java   | 2 +-
 .../src/main/java/jnpf/controller/UserMachineController.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java
index 7054da6..f931ed9 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java
@@ -106,7 +106,7 @@ public class UserMachineServiceImpl extends ServiceImpl<UserMachineMapper, UserM
                     .eq(UserMachineEntity::getUserId, userMachineForm.getUserId())
                     .eq(UserMachineEntity::getDeleteMark, 0));
             if (existingEntity != null) {
-                throw new Exception("该人员已配置机台班组，不能重复配置");
+                throw new Exception("该人员已配置，请确认！");
             }
             entity = new UserMachineEntity();
             BeanUtils.copyProperties(userMachineForm, entity);
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/UserMachineController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/UserMachineController.java
index a8b345c..68f5535 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/UserMachineController.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/UserMachineController.java
@@ -32,7 +32,7 @@ public class UserMachineController {
     private UserMachineService userMachineService;
 
     @Autowired
-    private UserMachineDetailService  userMachineDetailService;
+    private UserMachineDetailService userMachineDetailService;
 
     @Autowired
     private UserService userService;
@@ -83,7 +83,7 @@ public class UserMachineController {
             userMachineService.saveOrUpdate(userMachineForm, "", true);
             return ActionResult.success("新建成功");
         } catch (Exception e) {
-            return ActionResult.fail("新建数据失败：" + e.getMessage());
+            return ActionResult.fail(e.getMessage());
         }
     }