From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Controller/UserController.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/UserController.java b/src/main/java/com/gk/hotwork/Controller/UserController.java
index 338c9d5..12f0ae8 100644
--- a/src/main/java/com/gk/hotwork/Controller/UserController.java
+++ b/src/main/java/com/gk/hotwork/Controller/UserController.java
@@ -201,9 +201,12 @@
@ApiImplicitParam(name = "company",value = "单位名称"),
@ApiImplicitParam(name = "realname",value = "姓名"),
@ApiImplicitParam(name = "idcard",value = "身份证号"),
+ @ApiImplicitParam(name = "province",value = "省"),
+ @ApiImplicitParam(name = "city",value = "市"),
+ @ApiImplicitParam(name = "county",value = "县"),
})
public Msg getSuperviseUserInfo(@RequestParam(defaultValue = "0") Integer pageIndex, @RequestParam(defaultValue = "10") Integer pageSize, String sort,String order,
- String username,String company,String realname, String idcard){
+ String username,String company,String realname, String idcard, String province,String city,String county){
Msg msg = new Msg();
msg.setCode("200");
msg.setMessage("success");
@@ -226,16 +229,29 @@
if (StringUtils.isNotBlank(idcard)){
condition.put("idcard",idcard.trim());
}
+ if (StringUtils.isNotBlank(province)){
+ condition.put("province",province.trim());
- if(StringUtils.isNotBlank(userInfoCurrent.getProvince())){
- condition.put("province", userInfoCurrent.getProvince());
+ if(StringUtils.isNotBlank(city)){
+ condition.put("city", city);
+ }
+ if(StringUtils.isNotBlank(county)){
+ condition.put("county", county);
+ }
+
+ }else {
+ if(StringUtils.isNotBlank(userInfoCurrent.getProvince())){
+ condition.put("province", userInfoCurrent.getProvince());
+ }
+ if(StringUtils.isNotBlank(userInfoCurrent.getCity())){
+ condition.put("city", userInfoCurrent.getCity());
+ }
+ if(StringUtils.isNotBlank(userInfoCurrent.getCounty())){
+ condition.put("county", userInfoCurrent.getCounty());
+ }
}
- if(StringUtils.isNotBlank(userInfoCurrent.getCity())){
- condition.put("city", userInfoCurrent.getCity());
- }
- if(StringUtils.isNotBlank(userInfoCurrent.getCounty())){
- condition.put("county", userInfoCurrent.getCounty());
- }
+
+
pageInfo.setCondition(condition);
userService.selectSuperviseUserDataGrid(pageInfo);
@@ -2685,9 +2701,6 @@
/**
* 获取监管辖区内的企业
- */
- /**
- * 获取专家用户列表
*/
@GetMapping("/company/list")
@ApiOperation(value = "获取监管辖区企业数据",response = Msg.class)
--
Gitblit v1.9.2