commit

src/main/java/com/budwk/app/zhgh/integral/controller/IntegralManageController.java

@@ -275,7 +275,7 @@ public class IntegralManageController {
         List<ExcelExportEntity> entities = new ArrayList<>();
         entities.add(new ExcelExportEntity("工号", "loginName", 20));
         entities.add(new ExcelExportEntity("姓名", "userName", 20));
-        entities.add(new ExcelExportEntity("增加积分", "integral", 20));
+        entities.add(new ExcelExportEntity("积分", "integral", 20));
         ExportParams exportParams = new ExportParams();
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entities, Collections.emptyList());
         CommonDownloadUtil.download("积分增加导入模板.xlsx", workbook, response);

src/main/java/com/budwk/app/zhgh/integral/service/impl/IntegralManageServiceImpl.java

@@ -196,8 +196,9 @@ public class IntegralManageServiceImpl extends BaseServiceImpl<IntegralDetail> i
                 cnd.and("u.unionId", "=", SecurityUtil.getUnionId());
             }
         }
+        cnd.andEX("ind.year", "=", year);
         cnd.andEX("u.unionId", "=", unionId);
-        cnd.andEX("u.unionId", "=", unitId);
+        cnd.andEX("u.unitId", "=", unitId);
         cnd.andEX("u.personType", "=", personType);
         cnd.andEX("u.userState", "=", userState);
         cnd.andEX("DATE(ind.integralTime)", "=", integralTime);