diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java index a913f19c0..90ef2a1ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java @@ -102,6 +102,8 @@ public class SystemLogoConfig implements Serializable { private java.lang.Integer isOpenCertificateExpireWarn; @ApiModelProperty(value = "劳务人员资质证书提前多少天预警") private java.lang.Integer certificateExpireWarnAheadDay; + @ApiModelProperty(value = "是否显示资料中心0不显示1显示") + private java.lang.Integer showFileCenter; @TableField(exist = false) private java.lang.String fileStorageType; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index 6292e27d5..5e2785cb7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -312,7 +312,6 @@ public class SystemUserServiceImpl extends ServiceImpl() - .eq(XzSystemUserToCompanyProject::getType, 2) - .eq(XzSystemUserToCompanyProject::getUserId, systemUser.getUserId()) - .last("order by id limit 1") - ); - if (xzSystemUserToCompanyProject != null) { - result.put("sn", xzSystemUserToCompanyProject.getSn()); - } + XzSystemUserToCompanyProject toCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper() + .eq(XzSystemUserToCompanyProject::getType, 2) + .eq(XzSystemUserToCompanyProject::getUserId, systemUser.getUserId()) + .last("order by id limit 1") + ); + if (toCompanyProject != null) { + result.put("sn", toCompanyProject.getSn()); + SystemLogoConfig config = getSystemLogoConfig(toCompanyProject.getHeadquartersSn()); + result.put("systemLogoConfig", config); } return result; } else { @@ -400,10 +398,7 @@ public class SystemUserServiceImpl extends ServiceImpl().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn())); - if (slc == null) { - slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper().eq(SystemLogoConfig::getHeadquartersSn, "-1")); - } + SystemLogoConfig slc = this.getSystemLogoConfig(companyConfig.getHeadquartersSn()); String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), companyConfig.getEffectiveTime(), slc != null ? slc.getLoginTimeOut() : null); UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId()); if (userEnterprise != null) { @@ -457,20 +452,24 @@ public class SystemUserServiceImpl extends ServiceImpl() - .eq(XzSystemUserToCompanyProject::getType, 2) - .eq(XzSystemUserToCompanyProject::getUserId, systemUser.getUserId()) - .last("order by id limit 1") - ); - if (xzSystemUserToCompanyProject != null) { - result.put("sn", xzSystemUserToCompanyProject.getSn()); - } - } return result; } } + /** + * 查询系统logo配置 + * + * @param headquartersSn + * @return + */ + private SystemLogoConfig getSystemLogoConfig(String headquartersSn) { + SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper().eq(SystemLogoConfig::getHeadquartersSn, headquartersSn)); + if (slc == null) { + slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper().eq(SystemLogoConfig::getHeadquartersSn, "-1")); + } + return slc; + } + @Override public void register(Map map) { if (StringUtils.isNotEmpty(MapUtils.getString(map, "verificationCode"))) { diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/controller/EducationClassifyController.java b/src/main/java/com/zhgd/xmgl/modules/edu/controller/EducationClassifyController.java index 4bc94c110..52c8a04ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/edu/controller/EducationClassifyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/edu/controller/EducationClassifyController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.edu.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.edu.entity.EducationClassify; import com.zhgd.xmgl.modules.edu.service.IEducationClassifyService; @@ -36,10 +37,11 @@ public class EducationClassifyController { * 分页列表查询 * @return */ + @OperLog(operModul = "课程类型管理", operType = "查询", operDesc = "列表查询安全教育-分类信息") @ApiOperation(value = "列表查询安全教育-分类信息", notes = "列表查询安全教育-分类信息", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "sn", value = "项目SN或企业SN", paramType = "body", required = true, dataType = "String"), - }) + @ApiImplicitParams({ + @ApiImplicitParam(name = "sn", value = "项目SN或企业SN", paramType = "body", required = true, dataType = "String"), + }) @PostMapping(value = "/selectList") public Result> selectList(@RequestBody Map map) { Result> result = new Result<>(); @@ -56,8 +58,9 @@ public class EducationClassifyController { * @param educationClassify * @return */ - @ApiOperation(value = "添加安全教育-分类信息", notes = "添加安全教育-分类信息", httpMethod = "POST") - @PostMapping(value = "/add") + @OperLog(operModul = "课程类型管理", operType = "添加", operDesc = "添加安全教育-分类信息") + @ApiOperation(value = "添加安全教育-分类信息", notes = "添加安全教育-分类信息", httpMethod = "POST") + @PostMapping(value = "/add") public Result add(@RequestBody EducationClassify educationClassify) { educationClassifyService.addEducationClassify(educationClassify); return Result.success(educationClassify); @@ -68,7 +71,8 @@ public class EducationClassifyController { * @param educationClassify * @return */ - @ApiOperation(value = "编辑安全教育-分类信息", notes = "编辑安全教育-分类信息" , httpMethod="POST") + @OperLog(operModul = "课程类型管理", operType = "编辑", operDesc = "编辑安全教育-分类信息") + @ApiOperation(value = "编辑安全教育-分类信息", notes = "编辑安全教育-分类信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody EducationClassify educationClassify) { educationClassifyService.editEducationClassify(educationClassify); @@ -80,9 +84,10 @@ public class EducationClassifyController { * @param * @return */ - @ApiOperation(value = "删除安全教育-分类信息", notes = "删除安全教育-分类信息", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "安全教育-分类ID", paramType = "body", required = true, dataType = "Integer") - @PostMapping(value = "/delete") + @OperLog(operModul = "课程类型管理", operType = "删除", operDesc = "删除安全教育-分类信息") + @ApiOperation(value = "删除安全教育-分类信息", notes = "删除安全教育-分类信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "安全教育-分类ID", paramType = "body", required = true, dataType = "Integer") + @PostMapping(value = "/delete") public Result delete(@RequestBody Map map) { educationClassifyService.removeEducationClassify(MapUtils.getString(map,"id")); return Result.ok(); diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java index 41e33fa70..1646fe947 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java @@ -40,6 +40,7 @@ public class QualityRegionController { @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目唯一标识", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "notSupervisingUnit", value = "1不是监理单位", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "enterpriseId", value = "企业id", paramType = "body", required = false, dataType = "Integer"), }) @PostMapping(value = "/list") public Result> selectQualityRegionList(@RequestBody Map map) { diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml index 951a3c347..ae40633db 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml @@ -43,6 +43,9 @@ and et.id != 7 + + and ei.id = #{enterpriseId} + order by qr.region_code