Merge remote-tracking branch 'origin/master'

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);

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());
         }
     }
 

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">