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

Merge branch 'branch20211008'

Browse Source 
# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
This commit is contained in:
梁琦涛
2021-10-11 12:17:53 +08:00
parent 96f01589e8 e56721798d
commit 4f423668e7
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+4 -17
View File
@@ -102,9 +102,6 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if (!StringUtils.isBlank(p.getCompanyPhone())){
p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone()));
}
// if(!Objects.equals(p.getStatus(),PayCompanyManagementCommon.STATUS1)){
// p.setCompanyName(p.getCompanyName() + PayCompanyManagementCommon.COMPANY_STATUS);
// }
});
pageList.setRecords(listPayCompanyManagement);
}catch (Exception e){
@@ -210,9 +207,6 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if(!StringUtils.isBlank(item.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
}
if(!StringUtils.isEmpty(item.getPhone())){
sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
sendMessageDTO.setFromUser("admin");
sendMessageDTO.setToUser(item.getUsername());
@@ -244,7 +238,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
// 查看角色是否为财务人员
int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
int status = PayCompanyManagementCommon.STATUS2;
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1;
}
@@ -294,9 +288,6 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if(!StringUtils.isBlank(item.getEmail())){
sendMessageDTO.setEmail(PasswordUtil.decrypt(item.getEmail()));
}
if(!StringUtils.isEmpty(item.getPhone())){
sendMessageDTO.setPhone(PasswordUtil.decrypt(item.getPhone()));
}
HashMap<String,String> map = new HashMap<>();
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setToUser(item.getUsername());
@@ -327,7 +318,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
status = PayCompanyManagementCommon.STATUS1;
}
payCompanyManagement.setStatus(status);
@@ -382,7 +373,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
status = PayCompanyManagementCommon.STATUS1;
}
payCompanyManagement.setStatus(status);
@@ -463,10 +454,6 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
@ApiOperation(value="企业管理-批量删除", notes="企业管理-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)) {
return Result.error("非财务人员不可操作!");
}
if(StringUtils.isBlank(ids)){
return Result.error("id不能为空!");
}
@@ -630,7 +617,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
// 查看角色是否为财务人员
int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
int status = PayCompanyManagementCommon.STATUS2;
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1;
}
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+10 -2
View File
@@ -118,9 +118,17 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String newPassword = companyLoginVO.getNewPassword();
String verifyPassword = companyLoginVO.getVerifyPassword();
String RSAPublicKey = companyLoginVO.getRsaPublicKey();
String RSAPrivateKey = String.valueOf(redisUtil.get(RSAPublicKey));
try {
newPassword = CommonUtils.decryptBtRsaPriKey(newPassword, RSAPrivateKey);
verifyPassword = CommonUtils.decryptBtRsaPriKey(verifyPassword, RSAPrivateKey);
}catch (Exception e){
e.printStackTrace();
}
String phone = loginUser.getPhone();
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getPhone, PasswordUtil.encrypt(phone));
queryWrapper.eq(PayContactsManagement::getPhone, phone);
PayContactsManagement contactsManagement = this.getOne(queryWrapper);
if (oConvertUtils.isEmpty(newPassword)) {
@@ -129,7 +137,7 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
if (!newPassword.equals(verifyPassword)) {
throw new JeroBootException("两次输入密码不一致!");
}
String password = PasswordUtil.encrypt(phone, newPassword, contactsManagement.getSalt());
String password = PasswordUtil.encrypt(PasswordUtil.decrypt(phone), newPassword, contactsManagement.getSalt());
this.update(new PayContactsManagement().setPassword(password), new LambdaQueryWrapper<PayContactsManagement>().eq(PayContactsManagement::getPhone, phone));
}
}