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

修改bug#40676

Browse Source
This commit is contained in:
梁琦涛
2021-10-28 15:10:12 +08:00
parent df9164d321
commit 5abf03d353
2 changed files with 19 additions and 11 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
View File
@@ -816,6 +816,10 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
dataSource = PayCompanyManagementCommon.DATA_SOURCE1;
status = PayCompanyManagementCommon.STATUS1;
}
List<Object> excelData = super.getExcelData(request, PayCompanyManagement.class);
if (excelData.isEmpty()) {
throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
}
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+15 -11
View File
@@ -657,17 +657,17 @@ public class PayContactsManagementController extends JeroController<PayContactsM
public Result<?> queryByIdMeeting(@RequestParam(name="id") String id) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
if(sysUser.getId().equals(id)) {
PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
if (payContactsManagement == null) {
return Result.error("未找到对应数据");
}
if (!StringUtils.isBlank(payContactsManagement.getPhone())) {
payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
return Result.OK(payContactsManagement);
PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
if (payContactsManagement == null) {
return Result.error("未找到对应数据");
}
if (!StringUtils.isBlank(payContactsManagement.getPhone())) {
payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
return Result.OK(payContactsManagement);
}else{
return Result.OK("权限异常");
}
@@ -825,6 +825,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
@ApiOperation(value="联系人管理-excel导入数据", notes="联系人管理-excel导入数据")
@PostMapping(value = "/importExcel")
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
List<Object> excelData = super.getExcelData(request, PayContactsManagement.class);
if (excelData.isEmpty()) {
throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
}
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {