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

fixbug:41485,41439

Browse Source
This commit is contained in:
zhangqinlin
2021-10-27 09:14:36 +08:00
parent 002d61c5f0
commit 6b6c910ecf
2 changed files with 19 additions and 12 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
+17 -10
View File
@@ -17,6 +17,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
@@ -42,6 +43,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -634,17 +636,22 @@ public class PayContactsManagementController extends JeroController<PayContactsM
@ApiOperation(value="联系人管理-通过id查询-会议对外开放接口", notes="联系人管理-通过id查询-会议对外开放接口")
@GetMapping(value = "/queryByIdMeeting")
public Result<?> queryByIdMeeting(@RequestParam(name="id") String id) {
PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
if(payContactsManagement == null) {
return Result.error("未找到对应数据");
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);
}else {
return Result.OK("权限异常");
}
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);
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+2 -2
View File
@@ -115,7 +115,7 @@ public class PayMemberProjectSubitem implements Serializable {
/**
* 企业联系人临时id
*/
@Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
@Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
private String companyContactTemporaryId;
/**
@@ -134,7 +134,7 @@ public class PayMemberProjectSubitem implements Serializable {
/**
* 邮寄联系人临时id
*/
@Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
@Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
private String postContactTemporaryId;
/**