diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccontracts/ElectronicContractsMapper.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccontracts/ElectronicContractsMapper.java index c41cbbd0..87a73d97 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccontracts/ElectronicContractsMapper.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccontracts/ElectronicContractsMapper.java @@ -19,16 +19,16 @@ public interface ElectronicContractsMapper extends BaseMapperX selectPage(ElectronicContractsPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ElectronicContractsDO::getCreateBy, reqVO.getCreateBy()) + .likeIfPresent(ElectronicContractsDO::getCreateBy, reqVO.getCreateBy()) .betweenIfPresent(ElectronicContractsDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(ElectronicContractsDO::getCompanyId, reqVO.getCompanyId()) .eqIfPresent(ElectronicContractsDO::getCompany, reqVO.getCompany()) .eqIfPresent(ElectronicContractsDO::getDeptId, reqVO.getDeptId()) .likeIfPresent(ElectronicContractsDO::getDeptName, reqVO.getDeptName()) - .eqIfPresent(ElectronicContractsDO::getContractCode, reqVO.getContractCode()) - .eqIfPresent(ElectronicContractsDO::getContractTitle, reqVO.getContractTitle()) + .likeIfPresent(ElectronicContractsDO::getContractCode, reqVO.getContractCode()) + .likeIfPresent(ElectronicContractsDO::getContractTitle, reqVO.getContractTitle()) .eqIfPresent(ElectronicContractsDO::getContractType, reqVO.getContractType()) - .eqIfPresent(ElectronicContractsDO::getSignatory, reqVO.getSignatory()) + .likeIfPresent(ElectronicContractsDO::getSignatory, reqVO.getSignatory()) .betweenIfPresent(ElectronicContractsDO::getSignDate, reqVO.getSignDate()) .betweenIfPresent(ElectronicContractsDO::getEffectiveDate, reqVO.getEffectiveDate()) .betweenIfPresent(ElectronicContractsDO::getExpiryDate, reqVO.getExpiryDate()) diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccustomercomplaint/ElectronicCustomerComplaintMapper.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccustomercomplaint/ElectronicCustomerComplaintMapper.java index a3c94c79..38ae036e 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccustomercomplaint/ElectronicCustomerComplaintMapper.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/mysql/electroniccustomercomplaint/ElectronicCustomerComplaintMapper.java @@ -19,7 +19,7 @@ public interface ElectronicCustomerComplaintMapper extends BaseMapperX selectPage(ElectronicCustomerComplaintPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ElectronicCustomerComplaintDO::getCreateBy, reqVO.getCreateBy()) + .likeIfPresent(ElectronicCustomerComplaintDO::getCreateBy, reqVO.getCreateBy()) .betweenIfPresent(ElectronicCustomerComplaintDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(ElectronicCustomerComplaintDO::getCompany, reqVO.getCompany()) .likeIfPresent(ElectronicCustomerComplaintDO::getDeptName, reqVO.getDeptName()) @@ -29,7 +29,7 @@ public interface ElectronicCustomerComplaintMapper extends BaseMapperX selectPage(ElectronicEmployeePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ElectronicEmployeeDO::getCreateBy, reqVO.getCreateBy()) + .likeIfPresent(ElectronicEmployeeDO::getCreateBy, reqVO.getCreateBy()) .betweenIfPresent(ElectronicEmployeeDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(ElectronicEmployeeDO::getCompany, reqVO.getCompany()) .likeIfPresent(ElectronicEmployeeDO::getDeptName, reqVO.getDeptName()) diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java index 7d667f99..dd4543c3 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/service/electronicassets/ElectronicAssetsServiceImpl.java @@ -69,7 +69,7 @@ public class ElectronicAssetsServiceImpl implements ElectronicAssetsService { } }else { position=position+"/默认库房/默认档案柜"; - } + } } electronicAssets.setPosition(position); diff --git a/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/dal/mysql/organization/OrganizationMapper.java b/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/dal/mysql/organization/OrganizationMapper.java index e29d9c22..abc15faa 100644 --- a/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/dal/mysql/organization/OrganizationMapper.java +++ b/yudao-module-setting/yudao-module-setting-biz/src/main/java/cn/iocoder/yudao/module/setting/dal/mysql/organization/OrganizationMapper.java @@ -53,7 +53,7 @@ public interface OrganizationMapper extends BaseMapperX { + "IFNULL(c.id, '') AS cabinetId, IFNULL(c.name, '') AS cabinetName, IFNULL(c.code, '') AS cabinetCode " + "FROM setting_organization o " + "LEFT JOIN setting_depot d ON o.id = d.organization_id " - + "LEFT JOIN setting_depot_cabinet c ON d.id = c.depot_id ") + + "LEFT JOIN setting_depot_cabinet c ON d.id = c.depot_id " +"WHERE o.deleted = 0") @Results({ @Result(property = "organizationId", column = "organizationId"), @Result(property = "organizationName", column = "organizationName"), @Result(property = "organizationCode", column = "organizationCode"),