Commit 4f0fdc95 authored by lisong's avatar lisong

修改bug

parent 4274ade0
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
......@@ -19,6 +20,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -197,10 +199,23 @@ public class OrgPersonController extends BaseController {
// if(redisUtils.get("userList") != null){
// return ResponseHelper.buildResponse(redisUtils.get("userList"));
// }
return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(
String type = null;
if (requestBody.containsKey("type") && "station".equals(requestBody.get("type"))) {
type = "station";
requestBody.remove("type");
}
IPage<Map<String, Object>> mapIPage = iOrgUsrService.pagePerson(
requestBody.containsKey("pageNum") ? requestBody.get("pageNum").toString() : null ,
requestBody.containsKey("pageSize") ? requestBody.get("pageSize").toString() : null ,
requestBody));
requestBody);
if (!ObjectUtils.isEmpty(type)) {
for (Map<String, Object> record : mapIPage.getRecords()) {
if (!record.containsKey("amosOrgId")) {
record.put("amosOrgId", record.get("sequenceNbr"));
}
}
}
return ResponseHelper.buildResponse(mapIPage);
}
/**
......
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