From bc294243b0bb387469840dedb2239c29a93de663 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 19 Aug 2020 18:40:16 +0800 Subject: [PATCH] fix contract --- mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- .../iformall/service/park/impl/bolink/BoLinkParkService.java | 2 ++ .../com/iformall/service/park/impl/dahua/DaHuaParkService.java | 2 ++ .../iformall/service/park/impl/shangan/ShangAnParkService.java | 2 ++ .../java/com/iformall/service/park/impl/tjd/TJDParkService.java | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 43c9e2138..ad3b2ca39 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -154,7 +154,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index bebdf2e1c..a10dff55e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2456,7 +2456,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //如果存在其他的草稿状态或者履约驳回状态的合同,不允许提交审批 Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId()); if (null != count && count.intValue()>0) { - return new ResultData(Result.ERROR, "当前存在其他草稿状态或者履约驳回的合同。清作废再提交审批。"); + return new ResultData(Result.ERROR, "当前存在其他草稿状态或者履约驳回的合同。请先作废其他草稿或者审批拒绝或者撤回的合同。"); } if (CollectionUtils.isEmpty(rentContract.getFlowParams())) { diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java index 6f3fcf839..2b738dfae 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java @@ -3,6 +3,7 @@ package com.iformall.service.park.impl.bolink; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; import com.alibaba.fastjson.JSON; @@ -18,6 +19,7 @@ import com.iformall.service.park.ParkAdapterService; import com.iformall.service.park.impl.BaseParkService; import com.iformall.utils.car.BoLinkUtil; +@Service public class BoLinkParkService extends BaseParkService implements ParkAdapterService { @Override diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java index 8cc149a20..eb8ede07c 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java @@ -4,6 +4,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; import com.iformall.common.ErrorCode; @@ -16,6 +17,7 @@ import com.iformall.service.park.ParkAdapterService; import com.iformall.service.park.impl.BaseParkService; import com.iformall.utils.car.DaHuaUtil; +@Service public class DaHuaParkService extends BaseParkService implements ParkAdapterService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java index 424ba140c..78f1832ec 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java @@ -5,6 +5,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -21,6 +22,7 @@ import com.iformall.service.park.ParkAdapterService; import com.iformall.service.park.impl.BaseParkService; import com.iformall.utils.car.ShangAnUtil; +@Service public class ShangAnParkService extends BaseParkService implements ParkAdapterService{ private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java index 072b231f6..5415cf0b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; import com.alibaba.fastjson.JSON; @@ -32,6 +33,7 @@ import com.iformall.service.park.impl.BaseParkService; import com.iformall.service.park.impl.util.ParkHelper; import com.iformall.utils.car.TJDUtil; +@Service public class TJDParkService extends BaseParkService implements ParkAdapterService { private final Logger logger = LoggerFactory.getLogger(this.getClass());