From 98ef8736f9a47299d9ba70ceabc1ed0c4ba249db Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期三, 24 七月 2024 18:31:28 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 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 a2dda56..71d303e 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
@@ -1,14 +1,18 @@
package com.ruoyi.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanValidators;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.datascope.annotation.DataScope;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -597,6 +601,17 @@
return PageDTO.of(page,SupplierVO.class);
}
+ @Override
+ public List<SysUser> getSupplierPage1() {
+ LambdaQueryWrapper<SysUser> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SysUser::getUserType, "02");
+
+
+ wrapper1.eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime);
+ List<SysUser> page1 = this.list(wrapper1);
+ return page1;
+ }
+
/**
* 添加/编辑供应商
*
@@ -648,38 +663,51 @@
@Override
public PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query) {
- Page<SysUser> page = this.lambdaQuery()
- .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
- .like(StringUtils.isNotBlank(query.getNickName()
- ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "03")
- .eq(StringUtils.isNotBlank(query.getPhonenumber()
- ),SysUser::getPhonenumber,query.getPhonenumber())
- .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
- .page(new Page<>(query.getPageCurr(), query.getPageSize()));
- if (StringUtils.isEmpty(page.getRecords())) {
- return PageDTO.empty(page);
+ Page<SysUser> objectPage = new Page<>(query.getPageCurr(), query.getPageSize());
+
+ LambdaQueryWrapper<SysUser> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.like(StringUtils.isNotBlank(query.getNickName()
+ ),SysUser::getNickName,query.getNickName());
+ wrapper1.eq(SysUser::getUserType, "03");
+ if (query.getRoleType()!=0){
+ wrapper1.eq(SysUser::getRoleType, query.getRoleType());
}
- return PageDTO.of(page, ConservatorVO.class);
+
+ wrapper1.like(StringUtils.isNotBlank(query.getPhonenumber()
+ ),SysUser::getPhonenumber,query.getPhonenumber()) .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime);
+ Page<SysUser> page1 = this.page(objectPage, wrapper1);
+
+ return PageDTO.of(page1, ConservatorVO.class);
+ }
+
+ @Override
+ public List<SysUser> getConservatorPage1() {
+ List<SysUser> page1 = this.list();
+
+ return page1;
}
@Override
public void saveConservator(ConservatorDTO 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.setNickName(dto.getNickName());
user.setUserName(dto.getPhonenumber());
user.setUserType("03");
user.setCreateTime(new Date());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+ user.setPassword(SecurityUtils.encryptPassword("123456"));
user.setCreateBy(SecurityUtils.getUsername());
user.setProvinceName(dto.getProvinceName());
user.setProvinceCode(dto.getProvinceCode());
- user.setCityName(dto.getCityCode());
+ user.setCityName(dto.getCityName());
user.setCityCode(dto.getCityCode());
user.setCountyName(dto.getCountyName());
user.setCountyCode(dto.getCountyCode());
@@ -697,7 +725,6 @@
user.setPhonenumber(dto.getPhonenumber());
user.setUserName(dto.getPhonenumber());
user.setUpdateTime(new Date());
- user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
user.setUpdateBy(SecurityUtils.getUsername());
user.setRoleType(dto.getRoleType());
this.updateById(user);
--
Gitblit v1.7.1