Parcourir la source

fix contract

release_toaliyun_real
xiaohanzi il y a 5 ans
Parent
révision
bc294243b0
6 fichiers modifiés avec 10 ajouts et 2 suppressions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Voir le fichier

@@ -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);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Voir le fichier

@@ -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())) {


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java Voir le fichier

@@ -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


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java Voir le fichier

@@ -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());


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java Voir le fichier

@@ -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());


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java Voir le fichier

@@ -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());


Chargement…
Annuler
Enregistrer