java/xizang.git

			@@ -140,17 +140,17 @@
			<dependency>
			<groupId>cn.afterturn</groupId>
			<artifactId>easypoi-base</artifactId>
			<version>3.0.3</version>
			<version>4.3.0</version>
			</dependency>
			<dependency>
			<groupId>cn.afterturn</groupId>
			<artifactId>easypoi-web</artifactId>
			<version>3.0.3</version>
			<version>4.3.0</version>
			</dependency>
			<dependency>
			<groupId>cn.afterturn</groupId>
			<artifactId>easypoi-annotation</artifactId>
			<version>3.0.3</version>
			<version>4.3.0</version>
			</dependency>

			<!-- 阿里云短信 -->

			@@ -1198,8 +1198,8 @@
			List<FlwHisTask> flwHisTasks = flwHisTaskMapper.selectList(Wrappers.<FlwHisTask>lambdaQuery().eq(FlwHisTask::getInstanceId, instanceId));
			processDetailVO.setFlwHisTasks(flwHisTasks);

			List<StateProcessInstanceAction> list = stateProcessInstanceActionService.list(Wrappers.<StateProcessInstanceAction>lambdaQuery().eq(StateProcessInstanceAction::getInstanceId, flwTask.getInstanceId())
			.orderByDesc(StateProcessInstanceAction::getCreateTime));
			List<StateProcessInstanceAction> list = stateProcessInstanceActionService.list(Wrappers.<StateProcessInstanceAction>lambdaQuery().eq(StateProcessInstanceAction::getInstanceId, instanceId)
			.orderByAsc(StateProcessInstanceAction::getCreateTime));
			for (StateProcessInstanceAction stateProcessInstanceAction : list) {
			SysUser sysUser = sysUserService.selectUserById(Long.valueOf(stateProcessInstanceAction.getAuditorId()));
			if(Objects.nonNull(sysUser)){

			@@ -96,7 +96,7 @@
			#{item}
			</foreach>
			</if>
			<if test="query.ids != null and query.ids.size()=0">
			<if test="query.ids == null or query.ids.size()==0">
			<if test="query.partyTwoName != null and query.partyTwoName != ''">
			and t1.party_two_name like concat('%',#{query.partyTwoName},'%')
			</if>

	ruoyi-admin/pom.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史