From 869edb425d2e931d756c756c16ee5b3f42ee027a Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Fri, 04 Aug 2023 13:49:20 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/gk/hotwork/Controller/UserController.java | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Controller/UserController.java b/src/main/java/com/gk/hotwork/Controller/UserController.java
index d61a2b2..deda520 100644
--- a/src/main/java/com/gk/hotwork/Controller/UserController.java
+++ b/src/main/java/com/gk/hotwork/Controller/UserController.java
@@ -180,7 +180,10 @@
if (StringUtils.isNotBlank(job)){
condition.put("job",job.trim());
}
-
+ Integer type = getUser().getType();
+ if(type.equals(3)){
+ condition.put("companyid",getUser().getCompanyid());
+ }
pageInfo.setCondition(condition);
userService.selectCompanyUserDataGrid(pageInfo);
@@ -198,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");
@@ -223,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);
@@ -1760,8 +1779,15 @@
if (StringUtils.isNotBlank(company)) {
condition.put("company", company.trim());
}
-
- if (StringUtils.isNotBlank(province)) {
+ if(getUser().getType() == 3){
+ condition.put("companyid", getUser().getCompanyid());
+ }
+ if(getUser().getType() == 2){
+ condition.put("province", getUser().getProvince());
+ condition.put("city", getUser().getCity());
+ condition.put("area", getUser().getCounty());
+ }
+ /*if (StringUtils.isNotBlank(province)) {
condition.put("province", province.trim());
}
@@ -1779,11 +1805,11 @@
if (StringUtils.isNotBlank(community)) {
condition.put("community", community.trim());
- }
- UserInfo userInfo = userService.selectByUser(getUser().getUsername());
+ }*/
+ /*UserInfo userInfo = userService.selectByUser(getUser().getUsername());
if (!companyService.isMain(userInfo.getCompany())){
condition.put("company",userInfo.getCompany());
- }
+ }*/
//是系统菜单下的就显示主体，否则非主体
// if (isMain) {
// condition.put("isMain", 1);
@@ -1792,6 +1818,9 @@
// }
pageInfo.setCondition(condition);
companyService.selectDataGrid(pageInfo);
+ if(getUser().getType() ==4 ){
+ pageInfo.setResult(new ArrayList());
+ }
msg.setResult(pageInfo);
return msg;
}
@@ -2669,4 +2698,20 @@
msg.setResult(userService.selectExpertList(realname));
return msg;
}
+
+ /**
+ * 获取监管辖区内的企业
+ */
+ @GetMapping("/company/list")
+ @ApiOperation(value = "获取监管辖区企业数据",response = Msg.class)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "companyName",value = "企业名称"),
+ })
+ public Msg getCompanyList(String companyName){
+ Msg msg = new Msg();
+ msg.setCode("200");
+ msg.setMessage("success");
+ msg.setResult(companyService.selectCompanyList(companyName,getUser()));
+ return msg;
+ }
}
--
Gitblit v1.9.2