UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复用户注册和删除问题

Browse Source
zhairh
zhengmingliang 3 years ago
parent 22f86ca488
commit 2869abcd2c
2 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File

34
api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
Unescape Escape View File

@ -2,20 +2,30 @@ package com.glxp.sale.admin.controller.auth;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.dao.inout.WarehouseUserDao;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.auth.AuthRole;
import com.glxp.sale.admin.entity.auth.AuthRoleAdmin;
import com.glxp.sale.admin.entity.auth.CustomerInfoEntity;
import com.glxp.sale.admin.entity.inout.WarehouseUserEntity;
import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.sale.admin.req.auth.AuthAdminSaveRequest;
import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest;
import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.auth.AuthAdminResponse;
import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse;
import com.glxp.sale.admin.res.inventory.InvWarehouseResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.auth.AuthRoleAdminService;
import com.glxp.sale.admin.service.auth.AuthRoleService;
import com.glxp.sale.admin.service.auth.CustomerInfoService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.inout.WarehouseUserService;
import com.glxp.sale.admin.service.inventory.InvBusUserService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.util.PasswordUtils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -49,6 +59,12 @@ public class AuthAdminController {
@Resource
private CustomerInfoService customerInfoService;
@Resource
private WarehouseUserService warehouseUserService;
@Resource
private InvBusUserService invBusUserService;
/**
* 获取管理员列表
*/
@ -306,6 +322,24 @@ public class AuthAdminController {
@PostMapping("/admin/auth/admin/delete")
public BaseResponse delete(@RequestBody AuthAdminSaveRequest authAdminSaveRequest) {
FilterInvUserRequest warehouseUser=new FilterInvUserRequest();
warehouseUser.setUserid(authAdminSaveRequest.getId());
List<WarehouseUserEntity> warehouseUserEntityList=warehouseUserService.filterWarehouseUsers(warehouseUser);
if(warehouseUserEntityList.size()==0){
FilterInvBusUserRequest invBusUserEntity=new FilterInvBusUserRequest();
invBusUserEntity.setUserId(authAdminSaveRequest.getId()+"");
List<InvBusUserEntity> invBusUserList=invBusUserService.filterInvBusUser(invBusUserEntity);
if(invBusUserList.size()>0){
return ResultVOUtils.error(999,"该用户存在关联单据信息，请先解除再删除");
}
}else{
return ResultVOUtils.error(999,"该用户存在关联仓库信息，请先解除再删除");
}
if (authAdminSaveRequest.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！");
}

52
api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java
Unescape Escape View File

@ -325,28 +325,34 @@ public class RegisterController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
long userId = generateUserId();
UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId());
if (StrUtil.isBlank(userRegisterEntity.getCompanyId()) && StrUtil.isNotBlank(registerCheckRequest.getCompanyName())) {
//系统参数设置了 新用户注册时是否根据往来单位字典进行企业名称校验 不校验
//根据公司名称查询往来单位信息
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(registerCheckRequest.getCompanyName());
userId = Long.parseLong(basicUnitMaintainEntity.getErpId());
} else {
userId = Long.parseLong(userRegisterEntity.getCompanyId());
//注册时新增到往来单位字典
BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
basicUnitMaintainEntity.setName(userRegisterEntity.getCompanyName());
basicUnitMaintainEntity.setErpId(userRegisterEntity.getCompanyId());
basicUnitMaintainEntity.setCorpType(2);
basicUnitMaintainEntity.setOutType(0);
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
long customerId=Long.valueOf(registerCheckRequest.getCompanyId());
UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId());
// if (StrUtil.isNotBlank(userRegisterEntity.getCompanyId()) && StrUtil.isNotBlank(registerCheckRequest.getCompanyName())) {
// //系统参数设置了 新用户注册时是否根据往来单位字典进行企业名称校验 不校验
// //根据公司名称查询往来单位信息
// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(registerCheckRequest.getCompanyName());
// userId = Long.parseLong(basicUnitMaintainEntity.getErpId());
// } else {
// if(registerCheckRequest.getCheckType()==1){
// //注册时新增到往来单位字典
// BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity();
// basicUnitMaintainEntity.setName(userRegisterEntity.getCompanyName());
// basicUnitMaintainEntity.setErpId(userId+"");
// basicUnitMaintainEntity.setCorpType(2);
// basicUnitMaintainEntity.setOutType(0);
// basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
// }
// }
if(registerCheckRequest.getCheckType()==1){
//通过就更新用户id 供应商用户 供应商id
userRegisterEntity.setCompanyId(registerCheckRequest.getCompanyId());
userRegisterEntity.setCompanyName(registerCheckRequest.getCompanyName());
userRegisterEntity.setUserId(generateUserId() + "");
}
userRegisterEntity.setCheckType(registerCheckRequest.getCheckType());
userRegisterEntity.setCheckTime(DateUtil.getDateTime());
userRegisterEntity.setUserId(userId + "");
boolean b = userRegisterService.updateUserRegister(userRegisterEntity);
if (registerCheckRequest.getCheckType() != 1) {
return ResultVOUtils.success("修改成功");
@ -354,7 +360,7 @@ public class RegisterController {
//创建新用户
AuthAdmin authAdmin = new AuthAdmin();
// authAdmin.setCustomerId(Integer.valueOf(String.valueOf(userId)));
authAdmin.setCustomerId(userId + "");
authAdmin.setCustomerId(customerId + "");
authAdmin.setPassWord(userRegisterEntity.getPassword());
authAdmin.setCreateTime(DateUtil.parseDate(userRegisterEntity.getCheckTime()));
authAdmin.setUserName(userRegisterEntity.getUserName()); //用手机号当用户名，通过手机号登录
@ -372,7 +378,7 @@ public class RegisterController {
//生产客户信息表
CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
// customerInfoEntity.setCustomerId(Long.valueOf(String.valueOf(authAdmin.getCustomerId())));
customerInfoEntity.setCustomerId(userId);
customerInfoEntity.setCustomerId(customerId);
customerInfoEntity.setArea(userRegisterEntity.getArea());
customerInfoEntity.setDetailAddr(userRegisterEntity.getDetailAddr());
customerInfoEntity.setBussinessStatus(userRegisterEntity.getBussinessStatus());
@ -393,7 +399,7 @@ public class RegisterController {
//生产客户信息联系人表
CustomerContactEntity customerContactEntity = new CustomerContactEntity();
customerContactEntity.setContacts(userRegisterEntity.getRealName());
customerContactEntity.setCustomerId(userId + "");
customerContactEntity.setCustomerId(customerId + "");
customerContactEntity.setEmail(userRegisterEntity.getEmail());
customerContactEntity.setMobile(userRegisterEntity.getMobile());
customerContactEntity.setTel(userRegisterEntity.getTel());
@ -401,7 +407,7 @@ public class RegisterController {
//生产本企业信息
CompanyEntity companyEntity = new CompanyEntity();
companyEntity.setCustomerId(userId + "");
companyEntity.setCustomerId(customerId + "");
companyEntity.setArea(userRegisterEntity.getArea());
companyEntity.setAreaCode(userRegisterEntity.getAreaCode());
companyEntity.setDetailAddr(userRegisterEntity.getDetailAddr());
@ -435,7 +441,7 @@ public class RegisterController {
setupEntity.setCheckRepeat(true);
setupEntity.setDownloadRelation(true);
setupEntity.setUploadTime(24);
setupEntity.setCustomerId(userId + "");
setupEntity.setCustomerId(customerId + "");
setupService.insertSetup(setupEntity);

Write Preview
Loading…
Cancel
Save