修改bug
This commit is contained in:
parent
edafeb41a5
commit
e970f30e8c
|
@ -206,7 +206,7 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
|
|||
}
|
||||
// queryWrapper.eq("zt","在职");
|
||||
// queryWrapper.apply("(zt = '在职' or (zt= '退休' and ytkcs-0 >0))");
|
||||
queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
// queryWrapper.apply("dwmc in (select kkdw from kc_kkdw21_view)");
|
||||
Page<KcExportConfigTpkwcqkjzglx> page = new Page<>(pageNo, pageSize);
|
||||
IPage<KcExportConfigTpkwcqkjzglx> pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper);
|
||||
|
||||
|
|
|
@ -1,10 +1,15 @@
|
|||
package org.jeecg.modules.kc.grab.imports.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecg.modules.kc.grab.imports.entity.Xxhbuser;
|
||||
import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService;
|
||||
|
||||
|
@ -14,6 +19,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
|
@ -35,7 +41,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||
public class XxhbuserController extends JeecgController<Xxhbuser, IXxhbuserService> {
|
||||
@Autowired
|
||||
private IXxhbuserService xxhbuserService;
|
||||
|
||||
|
||||
@Autowired
|
||||
private SysBaseApiImpl sysBaseApi;
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
|
@ -53,6 +61,27 @@ public class XxhbuserController extends JeecgController<Xxhbuser, IXxhbuserServi
|
|||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<Xxhbuser> queryWrapper = QueryGenerator.initQueryWrapper(xxhbuser, req.getParameterMap());
|
||||
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
|
||||
String adminRole = "1";//0 admin 1教务秘书
|
||||
for(String role :roleList){
|
||||
if(StringUtils.equals("admin",role)){
|
||||
adminRole = "0";
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(StringUtils.equals("1",adminRole)){
|
||||
QueryWrapper<Xxhbuser> uqw = new QueryWrapper<>();
|
||||
uqw.eq("gh",sysUser.getUsername());
|
||||
uqw.last("limit 1");
|
||||
Xxhbuser xxhbUser = xxhbuserService.getOne(uqw);
|
||||
if(xxhbUser == null) {
|
||||
return Result.OK(new Page<>());
|
||||
}
|
||||
queryWrapper.eq("dwmc ",xxhbUser.getDwmc());
|
||||
}
|
||||
|
||||
Page<Xxhbuser> page = new Page<Xxhbuser>(pageNo, pageSize);
|
||||
IPage<Xxhbuser> pageList = xxhbuserService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
|
|
|
@ -75,6 +75,7 @@ public class Xxhbuser implements Serializable {
|
|||
/**zzzt*/
|
||||
@Excel(name = "zzzt", width = 15)
|
||||
@ApiModelProperty(value = "zzzt")
|
||||
@Dict(dicCode = "dm",dictTable = "xxhbjzgdqzt",dicText = "mc")
|
||||
private java.lang.String zzzt;
|
||||
/**时间戳*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
|
|
Loading…
Reference in New Issue