Merge remote-tracking branch 'origin/master'

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerAppletServiceImpl.java

@@ -227,6 +227,7 @@ public class CustomerAppletServiceImpl extends ServiceImpl<CustomerAppletDao, Cu
     /**
      * 修改个人类型的认证信息
      */
+    @Transactional
     @Override
     public Boolean updatePersonal(PersonalAppletRequest personalAppletRequest) {
         Integer customerId = this.getBaseMapper().getCustomerId(Integer.parseInt(this.getUserId()), 0);
@@ -260,6 +261,7 @@ public class CustomerAppletServiceImpl extends ServiceImpl<CustomerAppletDao, Cu
     /**
      * 修改企业类型的认证信息
      */
+    @Transactional
     @Override
     public Boolean updateCompany(CompanyAppletRequest companyAppletRequest) {
         Integer customerId = this.getBaseMapper().getCustomerId(Integer.parseInt(this.getUserId()), 1);

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java

@@ -77,7 +77,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         // 时间参数校验
         this.timeCheckout(customerRequest.getCreateTime(), customerRequest.getStartTime(), customerRequest.getEndTime(), customerRequest);
         // 分页参数校验
-        Page<Object> pages = this.pageCheckout(page, size);
+        if (page == null || size == null) {
+            page = 1;
+            size = 10;
+        }
+        Page<Object> pages = new Page<>(page, size);
         // 查询所有客户的基本信息
         IPage<CustomerEntityResponse> customerEntityIPage = customerDao.queryList(pages, customerRequest);
         // 获取所有的客户基本信息
@@ -478,7 +482,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
      * @param page 当前页
      * @param size 每页条数
      */
-    private Page<Object> pageCheckout(Integer page, Integer size) {
+    /*private Page<Object> pageCheckout(Integer page, Integer size) {
         // 查询客户有效总条数
         Integer count = this.count(new QueryWrapper<CustomerEntity>().eq("del_or_not", CrmsConstant.NOT_DELETE));
         if (size == null || size < 1) {
@@ -493,7 +497,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         }
         Page<Object> pages = new Page<>(page, size);
         return pages;
-    }
+    }*/
 
     /**
      * 拼接客户及其对应的客户经理及部门信息