1
This commit is contained in:
+1
-2
@@ -132,8 +132,6 @@ public class HealthCheckupListController {
|
|||||||
cnd.andEX("hcu.unionId", "=", unionId);
|
cnd.andEX("hcu.unionId", "=", unionId);
|
||||||
cnd.andEX("hcu.unitId", "=", unitId);
|
cnd.andEX("hcu.unitId", "=", unitId);
|
||||||
cnd.andEX("hcus.subjectId", "=", subjectId);
|
cnd.andEX("hcus.subjectId", "=", subjectId);
|
||||||
|
|
||||||
|
|
||||||
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
|
if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
|
||||||
cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId());
|
cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId());
|
||||||
}
|
}
|
||||||
@@ -155,6 +153,7 @@ public class HealthCheckupListController {
|
|||||||
} else {
|
} else {
|
||||||
cnd.desc("hcus.selectTime").asc("hcu.unitId");
|
cnd.desc("hcus.selectTime").asc("hcu.unitId");
|
||||||
}
|
}
|
||||||
|
cnd.desc("hcu.id");
|
||||||
Pagination pagination = healthCheckupProjectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
|
Pagination pagination = healthCheckupProjectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
|
||||||
List<NutMap> paginationList = pagination.getList();
|
List<NutMap> paginationList = pagination.getList();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user