LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业管理修改

Browse Source
This commit is contained in:
梁琦涛
2021-11-04 11:45:40 +08:00
parent 0209bc2efd
commit ff2deb5259
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+29 -2
View File
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
@@ -335,7 +336,20 @@ public class PayContactsManagementController extends JeroController<PayContactsM
}catch (Exception e){ }catch (Exception e){
log.error("手机号、邮箱加密异常！",e); log.error("手机号、邮箱加密异常！",e);
} }
payContactsManagementService.updateById(payContactsManagement); LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId());
updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payContactsManagement.getCompanyName());
updatePayContactsManagement.set(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId());
updatePayContactsManagement.set(PayContactsManagement::getName,payContactsManagement.getName());
updatePayContactsManagement.set(PayContactsManagement::getGender,StringUtils.isBlank(payContactsManagement.getGender()) ? null : payContactsManagement.getGender());
updatePayContactsManagement.set(PayContactsManagement::getPost,payContactsManagement.getPost());
updatePayContactsManagement.set(PayContactsManagement::getPhone,payContactsManagement.getPhone());
updatePayContactsManagement.set(PayContactsManagement::getEmail,payContactsManagement.getEmail());
updatePayContactsManagement.set(PayContactsManagement::getContactAddress,payContactsManagement.getContactAddress());
updatePayContactsManagement.set(PayContactsManagement::getPostalCode,payContactsManagement.getPostalCode());
updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
payContactsManagementService.update(updatePayContactsManagement);
// payContactsManagementService.updateById(payContactsManagement);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@@ -406,7 +420,20 @@ public class PayContactsManagementController extends JeroController<PayContactsM
}catch (Exception e){ }catch (Exception e){
log.error("手机号、邮箱加密异常！",e); log.error("手机号、邮箱加密异常！",e);
} }
payContactsManagementService.updateById(payContactsManagement); LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId());
updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payContactsManagement.getCompanyName());
updatePayContactsManagement.set(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId());
updatePayContactsManagement.set(PayContactsManagement::getName,payContactsManagement.getName());
updatePayContactsManagement.set(PayContactsManagement::getGender,StringUtils.isBlank(payContactsManagement.getGender()) ? null : payContactsManagement.getGender());
updatePayContactsManagement.set(PayContactsManagement::getPost,payContactsManagement.getPost());
updatePayContactsManagement.set(PayContactsManagement::getPhone,payContactsManagement.getPhone());
updatePayContactsManagement.set(PayContactsManagement::getEmail,payContactsManagement.getEmail());
updatePayContactsManagement.set(PayContactsManagement::getContactAddress,payContactsManagement.getContactAddress());
updatePayContactsManagement.set(PayContactsManagement::getPostalCode,payContactsManagement.getPostalCode());
updatePayContactsManagement.set(PayContactsManagement::getRemarks,payContactsManagement.getRemarks());
payContactsManagementService.update(updatePayContactsManagement);
// payContactsManagementService.updateById(payContactsManagement);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+6
View File
@@ -129,6 +129,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
if(!StringUtils.isBlank(msg)){ if(!StringUtils.isBlank(msg)){
throw new JeroBootException(msg.toString()); throw new JeroBootException(msg.toString());
} }
if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){
payCompanyManagement.setCompanyPhone("");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2; int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核 // 只有财务人员操作不需要重新审核，其他人都需要审核
@@ -183,6 +186,9 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
if(!StringUtils.isBlank(msg)){ if(!StringUtils.isBlank(msg)){
throw new JeroBootException(msg.toString()); throw new JeroBootException(msg.toString());
} }
if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){
payCompanyManagement.setCompanyPhone("");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2; int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核 // 只有财务人员操作不需要重新审核，其他人都需要审核