Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

郑永安

2023-07-24 0645153dfa233b51a749db73f9bd5a8c5127c595

 src/main/java/com/gk/hotwork/Controller/UserController.java

@@ -1760,8 +1760,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 +1786,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 +1799,9 @@
//        }
        pageInfo.setCondition(condition);
        companyService.selectDataGrid(pageInfo);
        if(getUser().getType() ==4 ){
            pageInfo.setResult(new ArrayList());
        }
        msg.setResult(pageInfo);
        return msg;
    }
@@ -2669,4 +2679,23 @@
        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;
    }
}