1

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -90,7 +90,7 @@ public class SalesOrderController {
         Integer companyId = user.getCompanyId();
         order.setCompanyId(companyId);
         order.setCreatorId(user.getId());
-        if(order.getReceivedPayment()!=null){
+        if(order.getReceivedPayment()!=null&&order.getReceivedPayment().intValue()!=0){
             BigDecimal price = order.getPrice();
             if(order.getPrice().doubleValue()!=order.getReceivedPayment().doubleValue()){
                 order.setReceivedStatus(1);
@@ -496,7 +496,7 @@ public class SalesOrderController {
             BigDecimal nowMoney = new BigDecimal(money);
             BigDecimal oldMoney = payment.getMoney();
             //离当前回款数据最近一次回款的未回款数据作为依据
-            SalesOrderPayment salesOrderPayment = list.get(i + 1);
+            SalesOrderPayment salesOrderPayment =list.size()>1?list.get(i+1):list.get(i);
             BigDecimal unReceivedPayment = salesOrderPayment.getUnReceivedPayment();
             unReceivedPayment=unReceivedPayment.subtract(nowMoney);
             payment.setMoney(new BigDecimal(money));

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ProductServiceImpl.java

@@ -98,8 +98,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         if(!hasPriviledgeAll){
             //判断查看负责部门的权限
             if(!hasPriviledgeDept){
-                //都没有就只能看自己创建的
-                queryWrapper.eq(Product::getCreatorId,targetUsr.getId());
+                //都没有就只能看自己创建的或者负责的
+                queryWrapper.and(wrapper->wrapper.eq(Product::getCreatorId,targetUsr.getId()).or().eq(Product::getInchargerId,targetUsr.getId()));
             }else {
                 List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getManagerId, targetUsr.getId()));
                 List<DepartmentOtherManager> otherManagerList = departmentOtherManagerMapper.selectList(new LambdaQueryWrapper<DepartmentOtherManager>().eq(DepartmentOtherManager::getOtherManagerId, targetUsr.getId()));

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -766,17 +766,17 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             switch (queryType){
                 case 0:
                     //仅本人
-                    customLambdaQueryWrapper.eq(Custom::getCreatorId,user.getId());
-                    contactsLambdaQueryWrapper.eq(Contacts::getCreatorId,user.getId());
-                    businessOpportunityLambdaQueryWrapper.eq(BusinessOpportunity::getCreatorId,user.getId());
-                    salesOrderLambdaQueryWrapper.eq(SalesOrder::getCreatorId,user.getId());
-                    clueLambdaQueryWrapper.eq(Clue::getCreateId,user.getId());
+                    customLambdaQueryWrapper.eq(Custom::getInchargerId,user.getId());
+                    contactsLambdaQueryWrapper.eq(Contacts::getOwnerId,user.getId());
+                    businessOpportunityLambdaQueryWrapper.eq(BusinessOpportunity::getInchargerId,user.getId());
+                    salesOrderLambdaQueryWrapper.eq(SalesOrder::getInchargerId,user.getId());
+                    clueLambdaQueryWrapper.eq(Clue::getInchargerId,user.getId());
 
-                    customLambdaQueryWrapper1.eq(Custom::getCreatorId,user.getId());
-                    contactsLambdaQueryWrapper1.eq(Contacts::getCreatorId,user.getId());
-                    businessOpportunityLambdaQueryWrapper1.eq(BusinessOpportunity::getCreatorId,user.getId());
-                    salesOrderLambdaQueryWrapper1.eq(SalesOrder::getCreatorId,user.getId());
-                    clueLambdaQueryWrapper1.eq(Clue::getCreateId,user.getId());
+                    customLambdaQueryWrapper1.eq(Custom::getInchargerId,user.getId());
+                    contactsLambdaQueryWrapper1.eq(Contacts::getOwnerId,user.getId());
+                    businessOpportunityLambdaQueryWrapper1.eq(BusinessOpportunity::getInchargerId,user.getId());
+                    salesOrderLambdaQueryWrapper1.eq(SalesOrder::getInchargerId,user.getId());
+                    clueLambdaQueryWrapper1.eq(Clue::getInchargerId,user.getId());
                     break;
                 case 1:
                     //本人及下属
@@ -786,17 +786,17 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, deptIds));
                     List<String> userIds = userList.stream().map(User::getId).distinct().collect(Collectors.toList());
                     userIds.add(user.getId());
-                    customLambdaQueryWrapper.in(Custom::getCreatorId,userIds);
-                    contactsLambdaQueryWrapper.in(Contacts::getCreatorId,userIds);
-                    businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,userIds);
-                    salesOrderLambdaQueryWrapper.in(SalesOrder::getCreatorId,userIds);
-                    clueLambdaQueryWrapper.in(Clue::getCreateId,userIds);
+                    customLambdaQueryWrapper.in(Custom::getInchargerId,userIds);
+                    contactsLambdaQueryWrapper.in(Contacts::getOwnerId,userIds);
+                    businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getInchargerId,userIds);
+                    salesOrderLambdaQueryWrapper.in(SalesOrder::getInchargerId,userIds);
+                    clueLambdaQueryWrapper.in(Clue::getInchargerId,userIds);
 
-                    customLambdaQueryWrapper1.in(Custom::getCreatorId,userIds);
-                    contactsLambdaQueryWrapper1.in(Contacts::getCreatorId,userIds);
-                    businessOpportunityLambdaQueryWrapper1.in(BusinessOpportunity::getCreatorId,userIds);
-                    salesOrderLambdaQueryWrapper1.in(SalesOrder::getCreatorId,userIds);
-                    clueLambdaQueryWrapper1.in(Clue::getCreateId,userIds);
+                    customLambdaQueryWrapper1.in(Custom::getInchargerId,userIds);
+                    contactsLambdaQueryWrapper1.in(Contacts::getOwnerId,userIds);
+                    businessOpportunityLambdaQueryWrapper1.in(BusinessOpportunity::getInchargerId,userIds);
+                    salesOrderLambdaQueryWrapper1.in(SalesOrder::getInchargerId,userIds);
+                    clueLambdaQueryWrapper1.in(Clue::getInchargerId,userIds);
                     break;
                 case 2:
                     //仅本部门
@@ -804,17 +804,17 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getDepartmentId, targetDeptId));
                     List<String> targetUserIds = users.stream().map(User::getId).distinct().collect(Collectors.toList());
                     targetUserIds.add(user.getId());
-                    customLambdaQueryWrapper.in(Custom::getCreatorId,targetUserIds);
-                    contactsLambdaQueryWrapper.in(Contacts::getCreatorId,targetUserIds);
-                    businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,targetUserIds);
-                    salesOrderLambdaQueryWrapper.in(SalesOrder::getCreatorId,targetUserIds);
-                    clueLambdaQueryWrapper.in(Clue::getCreateId,targetUserIds);
+                    customLambdaQueryWrapper.in(Custom::getInchargerId,targetUserIds);
+                    contactsLambdaQueryWrapper.in(Contacts::getOwnerId,targetUserIds);
+                    businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getInchargerId,targetUserIds);
+                    salesOrderLambdaQueryWrapper.in(SalesOrder::getInchargerId,targetUserIds);
+                    clueLambdaQueryWrapper.in(Clue::getInchargerId,targetUserIds);
 
-                    customLambdaQueryWrapper1.in(Custom::getCreatorId,targetUserIds);
-                    contactsLambdaQueryWrapper1.in(Contacts::getCreatorId,targetUserIds);
-                    businessOpportunityLambdaQueryWrapper1.in(BusinessOpportunity::getCreatorId,targetUserIds);
-                    salesOrderLambdaQueryWrapper1.in(SalesOrder::getCreatorId,targetUserIds);
-                    clueLambdaQueryWrapper1.in(Clue::getCreateId,targetUserIds);
+                    customLambdaQueryWrapper1.in(Custom::getInchargerId,targetUserIds);
+                    contactsLambdaQueryWrapper1.in(Contacts::getOwnerId,targetUserIds);
+                    businessOpportunityLambdaQueryWrapper1.in(BusinessOpportunity::getInchargerId,targetUserIds);
+                    salesOrderLambdaQueryWrapper1.in(SalesOrder::getInchargerId,targetUserIds);
+                    clueLambdaQueryWrapper1.in(Clue::getInchargerId,targetUserIds);
                     break;
                 case 3:
                     //本部门及下属部门
@@ -823,17 +823,17 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
                     List<User> users1 = userMapper.selectList(new LambdaQueryWrapper<User>().in(User::getDepartmentId, branchDepartment));
                     List<String> targetUserIds1 = users1.stream().map(User::getId).distinct().collect(Collectors.toList());
                     targetUserIds1.add(user.getId());
-                    customLambdaQueryWrapper.in(Custom::getCreatorId,targetUserIds1);
-                    contactsLambdaQueryWrapper.in(Contacts::getCreatorId,targetUserIds1);
-                    businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getCreatorId,targetUserIds1);
-                    salesOrderLambdaQueryWrapper.in(SalesOrder::getCreatorId,targetUserIds1);
-                    clueLambdaQueryWrapper.in(Clue::getCreateId,targetUserIds1);
+                    customLambdaQueryWrapper.in(Custom::getInchargerId,targetUserIds1);
+                    contactsLambdaQueryWrapper.in(Contacts::getOwnerId,targetUserIds1);
+                    businessOpportunityLambdaQueryWrapper.in(BusinessOpportunity::getInchargerId,targetUserIds1);
+                    salesOrderLambdaQueryWrapper.in(SalesOrder::getInchargerId,targetUserIds1);
+                    clueLambdaQueryWrapper.in(Clue::getInchargerId,targetUserIds1);
 
-                    customLambdaQueryWrapper1.in(Custom::getCreatorId,targetUserIds1);
-                    contactsLambdaQueryWrapper1.in(Contacts::getCreatorId,targetUserIds1);
-                    businessOpportunityLambdaQueryWrapper1.in(BusinessOpportunity::getCreatorId,targetUserIds1);
-                    salesOrderLambdaQueryWrapper1.in(SalesOrder::getCreatorId,targetUserIds1);
-                    clueLambdaQueryWrapper1.in(Clue::getCreateId,targetUserIds1);
+                    customLambdaQueryWrapper1.in(Custom::getInchargerId,targetUserIds1);
+                    contactsLambdaQueryWrapper1.in(Contacts::getOwnerId,targetUserIds1);
+                    businessOpportunityLambdaQueryWrapper1.in(BusinessOpportunity::getInchargerId,targetUserIds1);
+                    salesOrderLambdaQueryWrapper1.in(SalesOrder::getInchargerId,targetUserIds1);
+                    clueLambdaQueryWrapper1.in(Clue::getInchargerId,targetUserIds1);
                     break;
             }
         }