From bea726cf11c0f96c6e004bd0d3990bef5dc2c736 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 26 六月 2024 13:58:19 +0800
Subject: [PATCH] devredis
---
project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
index 8b65360..573579a 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
@@ -60,7 +60,9 @@
public Boolean insertByBo(SysCompanyBo bo)
{
SysCompany add = Convert.convert(SysCompany.class, bo);
+ add.setCompanyStatus(1);
validEntityBeforeSave(add);
+ add.setCompanyStatus(0);
boolean save = this.save(add);
addCompanyUser(add, 0);
return save;
@@ -72,14 +74,14 @@
{
SysCompany old = this.getById(bo.getCompanyId());
SysCompany update = Convert.convert(SysCompany.class, bo);
+ validEntityBeforeSave(update);
if (!old.getCompanyPhone().equals(update.getCompanyPhone())){
boolean delUser = delCompanyUser(old.getCompanyId());
if (!delUser) {
throw new BaseException("鍘熶紒涓氱敤鎴锋竻闄ゅけ璐ワ紝璇疯仈绯荤鐞嗗憳锛�");
}
- this.addCompanyUser(update, 0);
+ this.addCompanyUser(update, update.getCompanyStatus()==0 ? 1 : 0);
}
- validEntityBeforeSave(update);
return this.updateById(update);
}
@@ -197,6 +199,11 @@
if (phoneCount>0){
throw new BaseException(String.format("%1$s锛屼紒涓氳仈绯荤數璇濆凡瀛樺湪锛�", entity.getCompanyName()));
}
+ SysUser user = new SysUser();
+ user.setPhonenumber(entity.getCompanyPhone());
+ if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+ throw new BaseException(String.format("%1$s锛屼紒涓氳仈绯荤數璇濆凡瀛樺湪锛岃鏇存崲鎵嬫満鍙凤紒", entity.getCompanyName()));
+ }
} else {
int codeCount = this.count(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()).ne(SysCompany::getCompanyId,entity.getCompanyId()));
if (codeCount>0){
@@ -241,6 +248,11 @@
errorList.add(new ImportError(0, "浼佷笟鍚嶅凡瀛樺湪锛�"));
}
int phoneCount = this.count(lq().eq(SysCompany::getCompanyPhone, entity.getCompanyPhone()));
+ SysUser user = new SysUser();
+ user.setPhonenumber(entity.getCompanyPhone());
+ if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+ errorList.add(new ImportError(3, "浼佷笟鑱旂郴鐢佃瘽绯荤粺涓凡瀛樺湪锛岃鏇存崲鐢佃瘽锛�"));
+ }
if (phoneCount>0){
errorList.add(new ImportError(3, "浼佷笟鑱旂郴鐢佃瘽宸插瓨鍦紒"));
}
@@ -269,6 +281,7 @@
user.setPassword(phone);
user.setDeptId(one.getCompanyId());
user.setUserType("02");
+ user.setRecommendUser(user.getPassword());
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
{
return;
@@ -283,9 +296,7 @@
{
return;
}
- user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setRecommendUser(user.getPassword());
userService.insertUser(user);
}
--
Gitblit v1.9.1