hansha
/
pay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wanglei 7 months ago
parent 278d58f3c6 d08e005301
commit eff134edd9
6 changed files with 86 additions and 19 deletions
Show Stats Download Patch File Download Diff File

29
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
Unescape View File

@ -28,10 +28,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 注册验证
@ -71,7 +68,7 @@ public class SysRegisterController extends BaseController {
*/
@SaIgnore
@PostMapping("/registerGs")
public R<SysRole> register1(@Validated(AddGroup.class) @RequestBody PayTenantBo bo) {
public R<Map<String, Object>> register1(@Validated(AddGroup.class) @RequestBody PayTenantBo bo) {
//添加验证 手机号相同或者公司名相同不允许注册
PayTenantBo queryBo = new PayTenantBo();
queryBo.setPhone(bo.getPhone());
@ -88,6 +85,7 @@ public class SysRegisterController extends BaseController {
if(iPayTenantService.insertByBo(bo)){
//公司注册成功后自动添加角色：管理员 todo
Long[] adids={1L, 1921833283434213378L, 1921827581902888962L, 1921827581902888963L, 1921827581902888964L, 1921827581902888965L, 1921827581902888966L, 1921827581902888967L, 1921833488053334018L, 1921827579365335041L, 1921827579365335042L, 1921827579365335043L, 1921827579365335044L, 1921827579365335045L, 1921827579365335046L, 1921827582745944066L, 1921827582745944067L, 1921827582745944068L, 1921827582745944069L, 1921827582745944070L, 1921827582745944071L, 1921827581055639553L, 1921827581055639554L, 1921827581055639555L, 1921827581055639556L, 1921827581055639557L, 1921827581055639558L, 1921827581252771841L, 1921827581252771842L, 1921827581252771843L, 1921827581252771844L, 1921827581252771845L, 1921827581252771846L, 1921834138757656577L, 1921827582162935809L, 1921827582162935810L, 1921827582162935811L, 1921827582162935812L, 1921827582162935813L, 1921827582162935814L, 1921827582490091522L, 1921827582490091523L, 1921827582490091524L, 1921827582490091525L, 1921827582490091526L, 1921827582490091527L, 1921827583140208641L, 1921827583140208642L, 1921827583140208643L, 1921827583140208644L, 1921827583140208645L, 1921827583140208646L, 1921827581449904130L, 1921827581449904131L, 1921827581449904132L, 1921827581449904133L, 1921827581449904134L, 1921827581449904135L, 1921827583601582082L, 1921827583601582083L, 1921827583601582084L, 1921827583601582085L, 1921827583601582086L, 1921827583601582087L, 1921835117498494977L, 1921827582880161794L, 1921827582880161795L, 1921827582880161796L, 1921827582880161797L, 1921827582880161798L, 1921827582880161799L, 100L, 1001L, 1002L, 1003L, 1004L, 1005L, 1006L, 1007L, 101L, 1010L, 1011L, 1012L, 1013L, 1014L};
Long[] ygids={1921835117498494977L, 1921827582880161794L, 1921827582880161795L};
SysRole role1 = new SysRole();
role1.setRoleKey("companyAdmin");
role1.setRoleName("公司管理员");
@ -99,14 +97,27 @@ public class SysRegisterController extends BaseController {
role1.setFlag(false);
role1.setMenuIds(adids);
SysRole role2 = new SysRole();
role2.setRoleKey("yg");
role2.setRoleName("普通员工");
role2.setTenantId(bo.getId());
role2.setStatus("0");
role2.setRoleSort(0);
role2.setMenuCheckStrictly(false);
role2.setDeptCheckStrictly(true);
role2.setFlag(false);
role2.setMenuIds(ygids);
roleService.insertRole(role1);
/*Map<String ,Object> data = new HashMap<>();
roleService.insertRole(role2);
Map<String ,Object> data = new HashMap<>();
List<SysRole> roles = new ArrayList<>();
roles.add(role1);
// data.put("id",bo.getId());
data.put("roles",roles);*/
return new R().ok(role1);
roles.add(role2);
data.put("id",bo.getId());
data.put("roles",roles);
return new R().ok(data);
}else{
return new R().fail("注册失败，请重试");
}

4
ruoyi-pay/pom.xml
Unescape View File

@ -42,6 +42,10 @@
<artifactId>freemarker</artifactId>
<version>2.3.31</version>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
</dependencies>
<properties>

8
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayTenantBo.java
Unescape View File

@ -42,25 +42,25 @@ public class PayTenantBo extends BaseEntity {
/**
* 公司固话
*/
@NotBlank(message = "公司固话不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "公司固话不能为空", groups = { AddGroup.class, EditGroup.class })
private String fixPhone;
/**
* 公司地址
*/
@NotBlank(message = "公司地址不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "公司地址不能为空", groups = { AddGroup.class, EditGroup.class })
private String address;
/**
* 公司网址
*/
@NotBlank(message = "公司网址不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "公司网址不能为空", groups = { AddGroup.class, EditGroup.class })
private String website;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
//@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;

45
ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayEmployeeInfoServiceImpl.java
Unescape View File

@ -1,12 +1,19 @@
package com.ruoyi.pay.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.pay.domain.bo.PayEmployeeInfoBo;
@ -14,7 +21,9 @@ import com.ruoyi.pay.domain.vo.PayEmployeeInfoVo;
import com.ruoyi.pay.domain.PayEmployeeInfo;
import com.ruoyi.pay.mapper.PayEmployeeInfoMapper;
import com.ruoyi.pay.service.IPayEmployeeInfoService;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@ -30,6 +39,8 @@ import java.util.Collection;
public class PayEmployeeInfoServiceImpl implements IPayEmployeeInfoService {
private final PayEmployeeInfoMapper baseMapper;
private final ISysUserService userService;
private final ISysRoleService roleService;
/**
* 查询员工信息
@ -91,10 +102,42 @@ public class PayEmployeeInfoServiceImpl implements IPayEmployeeInfoService {
}
/**
* 新增员工信息
* 新增员工信息 默认手机号为用户名、密码
*/
@Override
@Transactional
public Boolean insertByBo(PayEmployeeInfoBo bo) {
// 新增一个系统员工
SysUser sysUser = new SysUser();
sysUser.setNickName(bo.getName());
sysUser.setUserName(bo.getPhone());
sysUser.setPassword(bo.getPhone());
sysUser.setDeptId(bo.getDeptId());
sysUser.setSex(bo.getSex());
sysUser.setPhonenumber(bo.getPhone());
sysUser.setCreateBy(LoginHelper.getUsername());
sysUser.setTenantId(bo.getTenantId());
/*sysUser.setRoleIds();
sysUser.setPostIds();*/
//查询角色，如果有普通员工角色则添加这个角色到用户
SysRole role = new SysRole();
role.setTenantId(bo.getTenantId());
List<SysRole> sysRoles = roleService.selectRoleList(role);
if(sysRoles!=null&&sysRoles.size()>0){
Long[] roleids = new Long[1];
for(SysRole sysRole :sysRoles){
if(sysRole.getRoleKey().equals("yg")){
roleids[0]=sysRole.getRoleId();
sysUser.setRoleIds(roleids);
break;
}
}
}
int id = userService.insertUser(sysUser);
// 关联用户ID
bo.setUserId(sysUser.getUserId());
PayEmployeeInfo add = BeanUtil.toBean(bo, PayEmployeeInfo.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;

15
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
Unescape View File

@ -192,6 +192,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDept>()
.eq(SysDept::getDeptName, dept.getDeptName())
.eq(SysDept::getParentId, dept.getParentId())
.eq(SysDept::getTenantId, dept.getTenantId())
.ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId()));
return !exist;
}
@ -221,12 +222,16 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
*/
@Override
public int insertDept(SysDept dept) {
SysDept info = baseMapper.selectById(dept.getParentId());
// 如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
throw new ServiceException("部门停用，不允许新增");
if(dept.getParentId()==0L){ //新增某公司顶级部门时
dept.setAncestors(dept.getParentId().toString());
}else{
SysDept info = baseMapper.selectById(dept.getParentId());
// 如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
throw new ServiceException("部门停用，不允许新增");
}
dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId());
}
dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId());
return baseMapper.insert(dept);
}

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
Unescape View File

@ -204,6 +204,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
public boolean checkUserNameUnique(SysUser user) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getUserName, user.getUserName())
.eq(SysUser::getTenantId, user.getTenantId())
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
return !exist;
}
@ -218,6 +219,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
public boolean checkNickNameUnique(SysUser user) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getNickName, user.getNickName())
.eq(SysUser::getTenantId, user.getTenantId())
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
return !exist;
}
@ -231,6 +233,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
public boolean checkPhoneUnique(SysUser user) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getPhonenumber, user.getPhonenumber())
.eq(SysUser::getTenantId, user.getTenantId())
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
return !exist;
}
@ -244,6 +247,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
public boolean checkEmailUnique(SysUser user) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
.eq(SysUser::getEmail, user.getEmail())
.eq(SysUser::getTenantId, user.getTenantId())
.ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
return !exist;
}

Write Preview
Loading…
Cancel
Save