Commit 6b696bdd by 彭祥礼

后台管理调整

parent 4b47d9e6
...@@ -185,9 +185,6 @@ public class LzKpiController extends BaseController { ...@@ -185,9 +185,6 @@ public class LzKpiController extends BaseController {
@RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month, @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) { @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Page<Map<String,Object>> page = new Page<>(pageNo, pageSize); Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
List<Map<String,Object>> dataList = new ArrayList<>(); List<Map<String,Object>> dataList = new ArrayList<>();
...@@ -204,7 +201,7 @@ public class LzKpiController extends BaseController { ...@@ -204,7 +201,7 @@ public class LzKpiController extends BaseController {
if(sysUserList.size()==0){ if(sysUserList.size()==0){
page.setRecords(null); page.setRecords(null);
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "查询成功!"); return ResponseData.success(page);
} }
List<Integer> schoolIds = new ArrayList<>(); List<Integer> schoolIds = new ArrayList<>();
Wrapper<School> schoolWrapper = new EntityWrapper<>(); Wrapper<School> schoolWrapper = new EntityWrapper<>();
...@@ -217,7 +214,7 @@ public class LzKpiController extends BaseController { ...@@ -217,7 +214,7 @@ public class LzKpiController extends BaseController {
if(schoolList.size()==0){ if(schoolList.size()==0){
page.setRecords(null); page.setRecords(null);
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "查询成功!"); return ResponseData.success(page);
} }
List<String> userIds2 = new ArrayList<>(); List<String> userIds2 = new ArrayList<>();
Wrapper<UserSchool> usWrapper = new EntityWrapper<>(); Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
...@@ -246,7 +243,7 @@ public class LzKpiController extends BaseController { ...@@ -246,7 +243,7 @@ public class LzKpiController extends BaseController {
if(lzKpis.size()==0){ if(lzKpis.size()==0){
page.setRecords(null); page.setRecords(null);
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "查询成功!"); return ResponseData.success(page);
} }
for (LzKpi lzKpi : lzKpis) { for (LzKpi lzKpi : lzKpis) {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
......
...@@ -293,9 +293,6 @@ public class LzSalaryController extends BaseController { ...@@ -293,9 +293,6 @@ public class LzSalaryController extends BaseController {
@RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month, @RequestParam(name = "schoolName", required = false) String schoolName,@RequestParam(name = "month", required = false) String month,
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) { @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Page<Map<String,Object>> page = new Page<>(pageNo, pageSize); Page<Map<String,Object>> page = new Page<>(pageNo, pageSize);
List<Map<String,Object>> dataList = new ArrayList<>(); List<Map<String,Object>> dataList = new ArrayList<>();
...@@ -312,7 +309,7 @@ public class LzSalaryController extends BaseController { ...@@ -312,7 +309,7 @@ public class LzSalaryController extends BaseController {
if(sysUserList.size()==0){ if(sysUserList.size()==0){
page.setRecords(null); page.setRecords(null);
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "查询成功!"); return ResponseData.success(page);
} }
List<Integer> schoolIds = new ArrayList<>(); List<Integer> schoolIds = new ArrayList<>();
Wrapper<School> schoolWrapper = new EntityWrapper<>(); Wrapper<School> schoolWrapper = new EntityWrapper<>();
...@@ -325,7 +322,7 @@ public class LzSalaryController extends BaseController { ...@@ -325,7 +322,7 @@ public class LzSalaryController extends BaseController {
if(schoolList.size()==0){ if(schoolList.size()==0){
page.setRecords(null); page.setRecords(null);
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "查询成功!"); return ResponseData.success(page);
} }
List<String> userIds2 = new ArrayList<>(); List<String> userIds2 = new ArrayList<>();
Wrapper<UserSchool> usWrapper = new EntityWrapper<>(); Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
...@@ -353,7 +350,7 @@ public class LzSalaryController extends BaseController { ...@@ -353,7 +350,7 @@ public class LzSalaryController extends BaseController {
if(lzWages.size()==0){ if(lzWages.size()==0){
page.setRecords(null); page.setRecords(null);
page.setTotal(0); page.setTotal(0);
return ResponseData.success(page, "查询成功!"); return ResponseData.success(page);
} }
for (LzWage lzWage : lzWages) { for (LzWage lzWage : lzWages) {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
......
...@@ -178,9 +178,7 @@ public class ManagerKpiController extends BaseController { ...@@ -178,9 +178,7 @@ public class ManagerKpiController extends BaseController {
@RequestParam(name = "name", required = false) String name,@RequestParam(name = "month", required = false) String month, @RequestParam(name = "name", required = false) String name,@RequestParam(name = "month", required = false) String month,
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) { @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Page<ManagerKpi> page = new Page<>(pageNo, pageSize); Page<ManagerKpi> page = new Page<>(pageNo, pageSize);
Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>(); Wrapper<ManagerKpi> managerKpiWrapper = new EntityWrapper<>();
managerKpiWrapper.like(StringUtils.isNotBlank(name),"name",name, SqlLike.DEFAULT); managerKpiWrapper.like(StringUtils.isNotBlank(name),"name",name, SqlLike.DEFAULT);
......
...@@ -138,7 +138,9 @@ public class NewUserController extends BaseController { ...@@ -138,7 +138,9 @@ public class NewUserController extends BaseController {
} }
List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper); List<SysUser> sysUserList = sysUserMapper.selectList(sysUserWrapper);
if(sysUserList.size()==0){ if(sysUserList.size()==0){
return ResponseData.error("未找到数据!!!"); page.setRecords(null);
page.setTotal(0);
return ResponseData.success(page);
} }
List<String> userIds0 = new ArrayList<>(); List<String> userIds0 = new ArrayList<>();
for (SysUser sysUser : sysUserList) { for (SysUser sysUser : sysUserList) {
...@@ -149,7 +151,9 @@ public class NewUserController extends BaseController { ...@@ -149,7 +151,9 @@ public class NewUserController extends BaseController {
userSchoolWrapper.groupBy("user_id"); userSchoolWrapper.groupBy("user_id");
List<UserSchool> userSchools = userSchoolMapper.selectList(userSchoolWrapper); List<UserSchool> userSchools = userSchoolMapper.selectList(userSchoolWrapper);
if(userSchools.size()==0){ if(userSchools.size()==0){
return ResponseData.error("未找到数据!!!"); page.setRecords(null);
page.setTotal(0);
return ResponseData.success(page);
} }
List<String> schoolIds = new ArrayList<>(); List<String> schoolIds = new ArrayList<>();
for (UserSchool userSchool : userSchools) { for (UserSchool userSchool : userSchools) {
...@@ -161,7 +165,9 @@ public class NewUserController extends BaseController { ...@@ -161,7 +165,9 @@ public class NewUserController extends BaseController {
schoolWrapper.eq(StringUtils.isNotBlank(salesSchool),"school_name",salesSchool); schoolWrapper.eq(StringUtils.isNotBlank(salesSchool),"school_name",salesSchool);
List<School> schoolList = schoolMapper.selectList(schoolWrapper); List<School> schoolList = schoolMapper.selectList(schoolWrapper);
if(schoolList.size()==0){ if(schoolList.size()==0){
return ResponseData.error("未找到数据!!!"); page.setRecords(null);
page.setTotal(0);
return ResponseData.success(page);
} }
List<Integer> schoolIds0 = new ArrayList<>(); List<Integer> schoolIds0 = new ArrayList<>();
List<String> userIds = new ArrayList<>(); List<String> userIds = new ArrayList<>();
...@@ -180,7 +186,9 @@ public class NewUserController extends BaseController { ...@@ -180,7 +186,9 @@ public class NewUserController extends BaseController {
hhrUserWrapper.in("id",userIds); hhrUserWrapper.in("id",userIds);
List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper); List<HhrUser> hhrUserList = hhrUserMapper.selectList(hhrUserWrapper);
if(hhrUserList.size()==0){ if(hhrUserList.size()==0){
return ResponseData.error("未找到数据!!!"); page.setRecords(null);
page.setTotal(0);
return ResponseData.success(page);
} }
/*List<String> userIds = new ArrayList<>(); /*List<String> userIds = new ArrayList<>();
for (HhrUser hhrUser : hhrUserList) { for (HhrUser hhrUser : hhrUserList) {
......
...@@ -78,9 +78,7 @@ public class RegularController extends BaseController { ...@@ -78,9 +78,7 @@ public class RegularController extends BaseController {
@Permission(menuname = "修改正则信息", value = "update", method = RequestMethod.POST) @Permission(menuname = "修改正则信息", value = "update", method = RequestMethod.POST)
public ResponseData<String> updateProduct(@RequestParam("regular") String regular) { public ResponseData<String> updateProduct(@RequestParam("regular") String regular) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Regular pro = JSON.parseObject(regular, Regular.class); Regular pro = JSON.parseObject(regular, Regular.class);
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
wrapper.eq("regular_id", pro.getRegularId()); wrapper.eq("regular_id", pro.getRegularId());
......
...@@ -230,9 +230,7 @@ public class StudentCardVerifyController extends BaseController { ...@@ -230,9 +230,7 @@ public class StudentCardVerifyController extends BaseController {
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageNo") int pageNo,
@RequestParam(name = "pageSize") int pageSize) { @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Page<StudentCard> page = new Page<>(pageNo, pageSize); Page<StudentCard> page = new Page<>(pageNo, pageSize);
Wrapper<StudentCard> studentCardWrapper = new EntityWrapper<>(); Wrapper<StudentCard> studentCardWrapper = new EntityWrapper<>();
studentCardWrapper.like(StringUtils.isNotBlank(userName),"user_name",userName, SqlLike.DEFAULT); studentCardWrapper.like(StringUtils.isNotBlank(userName),"user_name",userName, SqlLike.DEFAULT);
......
...@@ -149,9 +149,6 @@ public class YxtCouponController extends BaseController { ...@@ -149,9 +149,6 @@ public class YxtCouponController extends BaseController {
@RequestParam(name = "shelfState", required = false) String shelfState, @RequestParam(name = "shelfState", required = false) String shelfState,
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) { @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Page<YxtCoupon> page = new Page<>(pageNo, pageSize); Page<YxtCoupon> page = new Page<>(pageNo, pageSize);
......
...@@ -165,9 +165,7 @@ public class YxtOrderController extends BaseController { ...@@ -165,9 +165,7 @@ public class YxtOrderController extends BaseController {
@RequestParam(name = "orderNum", required = false) String orderNum, @RequestParam(name = "orderNum", required = false) String orderNum,
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) { @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
String month1 = ""; String month1 = "";
String month2 = ""; String month2 = "";
if (StringUtils.isNotBlank(month)) { if (StringUtils.isNotBlank(month)) {
......
...@@ -176,9 +176,6 @@ public class zjlSalaryController extends BaseController { ...@@ -176,9 +176,6 @@ public class zjlSalaryController extends BaseController {
@RequestParam(name = "name", required = false) String name,@RequestParam(name = "month", required = false) String month, @RequestParam(name = "name", required = false) String name,@RequestParam(name = "month", required = false) String month,
@RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) { @RequestParam(name = "pageNo") int pageNo, @RequestParam(name = "pageSize") int pageSize) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
return ResponseData.error("无数据权限");
}
Page<ZjlWage> page = new Page<>(pageNo, pageSize); Page<ZjlWage> page = new Page<>(pageNo, pageSize);
List<ZjlWage> dataList = new LinkedList<>(); List<ZjlWage> dataList = new LinkedList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment