Merge remote-tracking branch 'origin/master'

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

@@ -289,8 +289,8 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
     @Transactional
     public Boolean insertCompany(CompanyCustomerRequest companyCustomerReq) {
 
-        //Long userId = Long.parseLong(this.getUserId());
-        //companyCustomerReq.setManager(userId); // 从redis获取当前登录用户
+        Long userId = Long.parseLong(this.getUserId());
+        companyCustomerReq.setManager(userId); // 从redis获取当前登录用户
         boolean result = customerService.insertCompany(companyCustomerReq);
         return result;
     }
@@ -301,8 +301,8 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
     @Transactional
     public Boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq) {
 
-        //Long userId = Long.parseLong(this.getUserId());
-        //companyCustomerReq.setManager(userId);
+        Long userId = Long.parseLong(this.getUserId());
+        companyCustomerReq.setManager(userId);
         return customerService.updateCompanyNew(companyCustomerReq);
     }
 }