diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java index f9e1f01f..4121471c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -1,13 +1,11 @@ package com.glxp.api.admin.controller.basic; -import cn.hutool.extra.pinyin.PinyinUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; -import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; @@ -24,7 +22,6 @@ import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse; import com.glxp.api.admin.res.basic.BasicUnitMaintainResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; -import com.glxp.api.admin.res.basic.SrtBasicUnitResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.BasicUnitMaintainService; @@ -39,7 +36,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -416,8 +412,6 @@ public class BasicUnitMaintainController { } else { return ResultVOUtils.error(500, "第三方系统往来单位服务接口未启用"); } - - } //获取产品信息详情(多平台) diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index dbcff3ea..ee53728d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -8,7 +8,7 @@ SELECT * FROM thr_corp - AND unitId = #{unitId} + AND unitId like concat('%',#{unitId},'%') AND ( name LIKE concat('%',#{name},'%') or spell LIKE concat('%',#{name},'%') )