Merge branch 'dev' into 'main'

Dev

See merge request !21

ruoyi-admin/src/main/java/com/ruoyi/web/controller/other/LabelsController.java

@@ -44,6 +44,8 @@ public class LabelsController extends BaseController {
         LabelsExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotEmpty(bsCommonVO.getParentId())) {
             criteria.andParentIdEqualTo(bsCommonVO.getParentId());
+        }else{
+            criteria.andParentIdIsNull();
         }
         example.setOrderByClause(" sort + 0 asc ");
         List<Labels> list = bsCommonService.selectByExample(example);

ruoyi-system/src/main/java/com/ruoyi/system/service/grid/impl/GridCompanyEconomyInfoServiceImpl.java

@@ -79,7 +79,12 @@ public class GridCompanyEconomyInfoServiceImpl extends BaseServiceImpl<GridCompa
         }
         criteria.andIsValidEqualTo("1");
         example.setOrderByClause(" year desc ");
-        return gridCompanyEconomyInfoMapper.selectByExample(example);
+        List<GridCompanyEconomyInfo> res = gridCompanyEconomyInfoMapper.selectByExample(example);
+        for (GridCompanyEconomyInfo info : res) {
+            info.setSales(Arrays.asList(info.getYearSales().substring(1, info.getYearSales().length()-1).split(",")));
+            info.setTaxes(Arrays.asList(info.getYearTaxes().substring(1, info.getYearTaxes().length()-1).split(",")));
+        }
+        return res;
     }
 
     @Override