|
@@ -8,9 +8,13 @@ import java.io.UnsupportedEncodingException;
|
|
|
import java.net.URLDecoder;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
+import org.jeecg.common.system.api.ISysBaseAPI;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
+import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.oa.entity.SyCertificates;
|
|
|
import org.jeecg.modules.oa.service.ISyCertificatesService;
|
|
@@ -48,7 +52,8 @@ import io.swagger.annotations.ApiOperation;
|
|
|
public class SyCertificatesController extends JeecgController<SyCertificates, ISyCertificatesService> {
|
|
|
@Autowired
|
|
|
private ISyCertificatesService syCertificatesService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private ISysBaseAPI sysBaseAPI;
|
|
|
/**
|
|
|
* 分页列表查询
|
|
|
*
|
|
@@ -66,8 +71,24 @@ public class SyCertificatesController extends JeecgController<SyCertificates, IS
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
|
HttpServletRequest req) {
|
|
|
QueryWrapper<SyCertificates> queryWrapper = QueryGenerator.initQueryWrapper(syCertificates, req.getParameterMap());
|
|
|
+ queryWrapper.orderByDesc("create_time");
|
|
|
Page<SyCertificates> page = new Page<SyCertificates>(pageNo, pageSize);
|
|
|
IPage<SyCertificates> pageList = syCertificatesService.page(page, queryWrapper);
|
|
|
+ for (SyCertificates o:pageList.getRecords()) {
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(o.getUserId())){
|
|
|
+ LoginUser login = sysBaseAPI.getUserByName(o.getUserId());
|
|
|
+ if(login != null){
|
|
|
+ o.setUserId(login.getRealname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(o.getManageId())){
|
|
|
+ LoginUser login = sysBaseAPI.getUserByName(o.getManageId());
|
|
|
+ if(login != null){
|
|
|
+ o.setManageId(login.getRealname());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return Result.ok(pageList);
|
|
|
}
|
|
|
|