diff --git a/src/main/java/com/glxp/api/constant/ConstantStatus.java b/src/main/java/com/glxp/api/constant/ConstantStatus.java index 713edc2b6..010108580 100644 --- a/src/main/java/com/glxp/api/constant/ConstantStatus.java +++ b/src/main/java/com/glxp/api/constant/ConstantStatus.java @@ -198,7 +198,7 @@ public class ConstantStatus { public static final int CORP_TYPE_SPECIAL = 4; //特殊往来 public static final int CORP_TYPE_DEPT = 4; //部门 - + public static final int CORP_SICK_INN = 1; public static final int CORP_SICK_SICK = 1; public static final int CORP_SICK_CUS = 2; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index ffd642479..50b3e8d09 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -78,11 +78,6 @@ public class BasicCorpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List basicUnitMaintainEntities; - //是供应商的时候拉客户和供应商 -// if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) { -// basicUnitMaintainFilterRequest.setCorpType(null); -// basicUnitMaintainFilterRequest.setCorpTypeLists(new ArrayList<>(Arrays.asList(1, 2))); -// } basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -128,8 +123,10 @@ public class BasicCorpController { basicUnitMaintainEntity.setErpId(CustomUtil.getId()); if(basicUnitMaintainSaveRequest.getCorpType()==1){ basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); - }else{ + }else if(basicUnitMaintainSaveRequest.getCorpType()==2){ basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); + }else{ + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_INN); } basicUnitMaintainEntity.setUpdateTime(new Date()); basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId()); diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 479b22dcc..60a8a6149 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -45,7 +45,7 @@ ) - AND (outType = #{outType} or outType is NULL) + AND (outType = #{outType})