diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index 9387ac11..2fe15628 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -25,6 +25,7 @@ import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; import com.jero.company.common.PayCompanyManagementCommon; +import com.jero.company.entity.PayCompanyAndContactsManagement; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; @@ -878,13 +879,13 @@ public class PayCompanyManagementController extends JeroController saveOrEdit(@RequestParam("info") String info) { - payCompanyManagementService.saveOrEdit(info); + public Result saveOrEdit(@RequestBody PayCompanyAndContactsManagement payCompanyAndContactsManagement) { + payCompanyManagementService.saveOrEdit(payCompanyAndContactsManagement); return Result.OK("同步成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 3fa22f81..02f01e26 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -19,12 +19,10 @@ 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; -import com.jero.common.util.oConvertUtils; +import com.jero.common.util.*; import com.jero.company.common.PayCompanyManagementCommon; import com.jero.company.common.PayContactsManagementCommon; +import com.jero.company.entity.MemberInfo; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; @@ -251,6 +249,19 @@ public class PayContactsManagementController extends JeroController updatePayContactsManagement = new LambdaUpdateWrapper<>(); updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId()); updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payContactsManagement.getCompanyName()); @@ -302,10 +314,6 @@ public class PayContactsManagementController extends JeroController listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement); - if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ - payCompanyManagement.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagement.getCompanyPhone())); - } - if (!StringUtils.isBlank(payContactsManagement.getPhone())){ - payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); - } - if (!StringUtils.isBlank(payContactsManagement.getEmail())){ - payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); - } +// if(!StringUtils.isBlank(payCompanyManagement.getCompanyPhone())){ +// payCompanyManagement.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagement.getCompanyPhone())); +// } +// if (!StringUtils.isBlank(payContactsManagement.getPhone())){ +// payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); +// } +// if (!StringUtils.isBlank(payContactsManagement.getEmail())){ +// payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); +// } // 新增 if(CollectionUtils.isEmpty(listPayCompanyManagement)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index 0efa821d..2739b081 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -12,6 +12,7 @@ import com.jero.common.system.util.JwtUtil; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; import com.jero.company.common.PayContactsManagementCommon; +import com.jero.company.entity.MemberInfo; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.mapper.PayContactsManagementMapper; @@ -126,6 +127,19 @@ public class PayContactsManagementServiceImpl extends ServiceImpl