소스 검색

[bug][修改][1001640]

release_toaliyun_real
luozukai 7 년 전
부모
커밋
0305ac88f2
2개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java 파일 보기

@@ -13,6 +13,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.mapper.WxMerchantMapper;
import com.iformall.service.*;
import com.iformall.service.impl.WxFlowServiceImpl;
import com.iformall.shiro.UserSession;
import com.iformall.shiro.UseriFormallToken;
import com.iformall.utils.ShiroUtils;
@@ -27,10 +28,13 @@ import org.apache.shiro.authc.DisabledAccountException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.imageio.ImageIO;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java 파일 보기

@@ -673,7 +673,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
logger.info("合同id:{},开始停止...", id);
//结束审批流 by luozukai
List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1))
.processVariableValueEquals("businessId", id).list();
.processVariableValueEquals("businessId", id+"").list();
if (!CollectionUtils.isEmpty(tasks)) {
for (Task task : tasks) {
logger.info("合同id:{},taskid:{}", id, task.getId());


불러오는 중...
취소
저장