Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/SysGeographyPositionServiceImpl.java

@@ -106,7 +106,7 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
     public SysPcAddressNumVo queryPcNum() {
         SysPcAddressNumVo sysPcAddressNumVo = new SysPcAddressNumVo();
 
-        Long all = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>());
+        Long all = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>().in(SysGeographyPosition::getSource, Arrays.asList("1", "2")));
         Long channelNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>().eq(SysGeographyPosition::getSource, 1));
         Long proxyNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>().eq(SysGeographyPosition::getSource, 2));
         sysPcAddressNumVo.setAllNum(all);

src/main/java/com/ydtech/modules/admin/service/impl/SysPcAddressServiceImpl.java

@@ -99,7 +99,7 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
     public SysPcAddressNumVo queryPcNum() {
         SysPcAddressNumVo sysPcAddressNumVo = new SysPcAddressNumVo();
 
-        Long all = sysPcAddressMapper.selectCount(new LambdaQueryWrapper<SysPcAddress>());
+        Long all = sysPcAddressMapper.selectCount(new LambdaQueryWrapper<SysPcAddress>().in(SysPcAddress::getSource, Arrays.asList("1","2")));
         Long channelNum = sysPcAddressMapper.selectCount(new LambdaQueryWrapper<SysPcAddress>().eq(SysPcAddress::getSource,1));
         Long proxyNum = sysPcAddressMapper.selectCount(new LambdaQueryWrapper<SysPcAddress>().eq(SysPcAddress::getSource,2));
         sysPcAddressNumVo.setAllNum(all);

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1978,6 +1978,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
             if (!CollectionUtils.isEmpty(byTaskId)) {
                 params.put("incomeIds", byTaskId);
             }
+            params.put("handlingFeesStatus","0");
             List<InsPlyIncome> insPlyIncomes = baseMapper.queryNew(params);
             if (!CollectionUtils.isEmpty(insPlyIncomes)) {
                 if (insPlyIncomeVo != null) { // 确保insPlyIncomeVo不是null