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-10-11 12:09:14 +08:00
parent b027f488f8
commit 96f01589e8
1 changed files with 17 additions and 4 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
+17 -4
View File
@@ -102,6 +102,9 @@ 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){
@@ -207,6 +210,9 @@ 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());
@@ -238,7 +244,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
// 查看角色是否为财务人员
int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
int status = PayCompanyManagementCommon.STATUS2;
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1;
}
@@ -288,6 +294,9 @@ 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());
@@ -318,7 +327,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
status = PayCompanyManagementCommon.STATUS1;
}
payCompanyManagement.setStatus(status);
@@ -373,7 +382,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
int status = PayCompanyManagementCommon.STATUS2;
// 只有财务人员操作不需要重新审核，其他人都需要审核
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
status = PayCompanyManagementCommon.STATUS1;
}
payCompanyManagement.setStatus(status);
@@ -454,6 +463,10 @@ 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不能为空!");
}
@@ -617,7 +630,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
// 查看角色是否为财务人员
int dataSource = PayCompanyManagementCommon.DATA_SOURCE2;
int status = PayCompanyManagementCommon.STATUS2;
if(Objects.equals(sysUser.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE)){
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1;
}