From cf08f9cb84e07601519e56c5554ca4cca6aa4372 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 24 七月 2024 08:59:11 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 872b010..a2dda56 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -586,7 +586,7 @@
@Override
public PageDTO<SupplierVO> getSupplierPage(SupplierQuery query) {
Page<SysUser> page = this.lambdaQuery()
- .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
+ .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber, SysUser::getContacts)
.like(StringUtils.isNotBlank(query.getNickName()
), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "02")
.eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
@@ -594,7 +594,7 @@
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
- return PageDTO.of(page, SupplierVO.class);
+ return PageDTO.of(page,SupplierVO.class);
}
/**
@@ -606,14 +606,17 @@
public void saveSupplier(SupplierDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
- boolean b = checkPhoneUnique(user);
- if (!b) {
- throw new ServiceException("该手机号已存在");
- }
+
+
// 添加
if (StringUtils.isNull(dto.getUserId())) {
+ boolean b = checkPhoneUnique(user);
+ if (!b) {
+ throw new ServiceException("该手机号已存在");
+ }
user.setUserName(dto.getPhonenumber());
user.setUserType("02");
+ user.setContacts(dto.getContacts());
user.setCreateTime(new Date());
user.setCreateBy(SecurityUtils.getUsername());
this.save(user);
@@ -625,7 +628,7 @@
}
user.setNickName(dto.getNickName());
user.setPhonenumber(dto.getPhonenumber());
- user.setUserName(dto.getPhonenumber());
+ user.setContacts(dto.getContacts());
user.setUpdateTime(new Date());
user.setUpdateBy(SecurityUtils.getUsername());
this.updateById(user);
--
Gitblit v1.7.1