diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java index 4f6851c4..b996745c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java @@ -9,12 +9,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.*; import com.jero.company.common.PayContactsManagementCommon; +import com.jero.company.entity.MemberInfo; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.entity.PayManagerManagement; @@ -24,6 +26,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -137,8 +140,8 @@ public class PayManagerManagementController extends JeroController edit(@Validated @RequestBody PayManagerManagement payManagerManagement) { - payManagerManagementService.editById(payManagerManagement); + + StringBuilder msg = ValidUtil.validateAll(payManagerManagement); + if(!StringUtils.isBlank(msg)){ + return Result.error(msg.toString()); + } + PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(payManagerManagement.getCompanyId()); + if(Objects.isNull(payCompanyManagement)){ + return Result.error("企业不存在！"); + } + payManagerManagement.setCompanyName(payCompanyManagement.getCompanyName()); + PayManagerManagement payManagerManagementOld = payManagerManagementService.getById(payManagerManagement.getId()); + if(Objects.isNull(payManagerManagementOld)){ + return Result.error("管理员不存在！"); + } + + try { + String phone = PasswordUtil.encrypt(payManagerManagement.getPhone()); + // 编辑保存管理员前再次校验手机号是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayManagerManagement::getPhone,phone); + PayManagerManagement payManagerManagementNew = payManagerManagementService.getOne(queryWrapper); + // 手机号存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payManagerManagementNew) && !Objects.equals(payManagerManagementNew.getId(),payManagerManagement.getId())) { + return Result.error("手机号已存在！"); + } + }catch (Exception e){ + log.info("联系人管理-编辑异常",e); + return Result.error("手机号已存在！"); + } + try { + // 新增管理员前校验同企业下管理员是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayManagerManagement::getName,payManagerManagement.getName()); + queryWrapper.eq(PayManagerManagement::getCompanyId,payManagerManagement.getCompanyId()); + PayManagerManagement payManagerManagementNew = payManagerManagementService.getOne(queryWrapper); + // 姓名存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payManagerManagementNew) && !Objects.equals(payManagerManagementNew.getId(),payManagerManagement.getId())) { + return Result.error("管理员姓名已存在！"); + } + }catch (Exception e){ + log.info("管理员管理-编辑异常",e); + return Result.error("管理员姓名已存在！"); + } + + LambdaUpdateWrapper updatePayManagerManagement = new LambdaUpdateWrapper<>(); + try { + if (!StringUtils.isBlank(payManagerManagement.getPhone())){ + payManagerManagement.setPhone(PasswordUtil.encrypt(payManagerManagement.getPhone())); + } + }catch (Exception e){ + log.error("手机号加密异常！",e); + } + updatePayManagerManagement.eq(PayManagerManagement::getId,payManagerManagement.getId()); + updatePayManagerManagement.set(PayManagerManagement::getCompanyName,payManagerManagement.getCompanyName()); + updatePayManagerManagement.set(PayManagerManagement::getCompanyId,payManagerManagement.getCompanyId()); + updatePayManagerManagement.set(PayManagerManagement::getName,payManagerManagement.getName()); + updatePayManagerManagement.set(PayManagerManagement::getGender,StringUtils.isBlank(payManagerManagement.getGender()) ? null : payManagerManagement.getGender()); + updatePayManagerManagement.set(PayManagerManagement::getPost,payManagerManagement.getPost()); + updatePayManagerManagement.set(PayManagerManagement::getPhone,payManagerManagement.getPhone()); + updatePayManagerManagement.set(PayManagerManagement::getEmail,payManagerManagement.getEmail()); + updatePayManagerManagement.set(PayManagerManagement::getContactAddress,payManagerManagement.getContactAddress()); + updatePayManagerManagement.set(PayManagerManagement::getPostalCode,payManagerManagement.getPostalCode()); + updatePayManagerManagement.set(PayManagerManagement::getRemarks,payManagerManagement.getRemarks()); + payManagerManagementService.update(updatePayManagerManagement); return Result.OK("编辑成功!"); } @@ -161,6 +227,10 @@ public class PayManagerManagementController extends JeroController delete(@RequestParam(name="id") String id) { + PayManagerManagement managerManagement=payManagerManagementService.queryById(id); + if(Objects.isNull(managerManagement)){ + return Result.error("管理员不存在！"); + } payManagerManagementService.deleteById(id); return Result.OK("删除成功!"); } @@ -172,7 +242,20 @@ public class PayManagerManagementController extends JeroController deleteBatch(@RequestParam(name="ids") String ids) { - this.payManagerManagementService.deleteByIds(Arrays.asList(ids.split(","))); + if(StringUtils.isBlank(ids)){ + return Result.error("id不能为空!"); + } + List idList = Arrays.asList(ids.split(",")); + for (String id : idList) { + if(StringUtils.isBlank(id)){ + return Result.error("id不能为空!"); + } + PayManagerManagement managerManagement=payManagerManagementService.queryById(id); + if(Objects.isNull(managerManagement)){ + return Result.error("管理员不存在！"); + } + } + this.payManagerManagementService.deleteByIds(idList); return Result.OK("批量删除成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java index 5a799639..17f48b71 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayManagerManagement.java @@ -64,7 +64,7 @@ public class PayManagerManagement implements Serializable { @Excel(name = "性别", width = 15) @ApiModelProperty(value = "性别") @Dict(dicCode = "sex") - private Integer gender; + private String gender; /**职务*/ @Excel(name = "职务", width = 15) @@ -151,7 +151,7 @@ public class PayManagerManagement implements Serializable { /**删除状态 0:通过 1：未通过（会员系统审核状态）*/ @Excel(name = "删除状态 ", width = 15) @ApiModelProperty(value = "删除状态 ") - private Integer delFlag; + private String delFlag; /**用户名用于会员系统使用*/ @ApiModelProperty(value = "用户名用于会员系统使用") @@ -161,11 +161,11 @@ public class PayManagerManagement implements Serializable { @Excel(name = "企业角色", width = 15) @ApiModelProperty(value = "企业角色") @Dict(dicCode = "company_role") - private Integer roleCode; + private String roleCode; /**会员性质字段*/ @ApiModelProperty(value = "会员性质字段") - private Integer memberNature; + private String memberNature; /**会员企业id*/ @ApiModelProperty(value = "会员企业id")