licq/chem_mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
z 2026-04-16 09:56:31 +08:00
commit e54b5b9f05
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/UserMachineServiceImpl.java
View File

@ -101,6 +101,13 @@ public class UserMachineServiceImpl extends ServiceImpl<UserMachineMapper, UserM
public void saveOrUpdate(UserMachineForm userMachineForm, String id, boolean isSave) throws Exception { public void saveOrUpdate(UserMachineForm userMachineForm, String id, boolean isSave) throws Exception {
UserMachineEntity entity; UserMachineEntity entity;
if (isSave) { 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(); entity = new UserMachineEntity();
BeanUtils.copyProperties(userMachineForm, entity); BeanUtils.copyProperties(userMachineForm, entity);
entity.setId(null); entity.setId(null);

4
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/UserMachineController.java
View File

@ -32,7 +32,7 @@ public class UserMachineController {
private UserMachineService userMachineService; private UserMachineService userMachineService;
@Autowired @Autowired
private UserMachineDetailService userMachineDetailService; private UserMachineDetailService userMachineDetailService;
@Autowired @Autowired
private UserService userService; private UserService userService;
@ -83,7 +83,7 @@ public class UserMachineController {
userMachineService.saveOrUpdate(userMachineForm, "", true); userMachineService.saveOrUpdate(userMachineForm, "", true);
return ActionResult.success("新建成功"); return ActionResult.success("新建成功");
} catch (Exception e) { } catch (Exception e) {
return ActionResult.fail("新建数据失败：" + e.getMessage()); return ActionResult.fail(e.getMessage());
} }
} }

16
jnpf-java-boot/jnpf-web/src/views/example/usermachine/form.vue
View File

@ -11,12 +11,16 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="人员" prop="userId"> <el-form-item label="人员" prop="userId">
<UserSelect <template v-if="dataForm.id">
v-model="dataForm.userId" <el-input v-model="dataForm.userName" disabled style="width: 100%;" />
@change="handleUserChange" </template>
placeholder="请选择人员" <template v-else>
:disabled="!!dataForm.id" <UserSelect
></UserSelect> v-model="dataForm.userId"
@change="handleUserChange"
placeholder="请选择人员"
></UserSelect>
</template>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">