~yxh/opo.git - Gitblit

			@@ -519,21 +519,20 @@
			log.info("sserviceFund保存的的值是-------- :{}", aBoolean);

			//办公室审批通过之后，就需要把“办公室主任”的名字填上
			List<SysUser> sysUsers =null;
			SysUser sysUsers =null;
			if(StringUtils.isNotEmpty(user.getUserName())) {
			SysUser su = new SysUser();
			su.setUserName(user.getUserName());
			sysUsers = sysUserMapper.selectAllocatedList(su);
			sysUsers = sysUserMapper.selectUserByUserName(user.getUserName());
			log.info("费用sysUsers返回的值为:{}", sysUsers);
			}
			if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null && !sysUsers.isEmpty()
			&& sysUsers.get(0).getRoles() != null
			&& sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
			if (checkFundVO.getFlowconclusion() == 1 && sysUsers != null
			&& sysUsers.getRoles() != null
			&& sysUsers.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
			serviceFund.setOfficedirector(user.getNickName());
			serviceFund.setUploadStates(1);
			//数据发送
			Boolean aBoolean1 = null;
			if (newSwitch == 1) {
			log.info("费用newSwitch返回的值为:{}", newSwitch);
			//搞一个开关，别影响老流程
			aBoolean1 = sendData(serviceFund);
			if (!aBoolean1) {

			@@ -447,7 +447,8 @@
			map.put("审批人：", loginUser.getUser().getUserName());
			map.put("审批时间：", new Date());
			map.put("意见：", "不通过");
			if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("意见：", checkFundVO.getFlowcontent());
			if (StringUtils.isNotBlank(checkFundVO.getFlowcontent()))
			map.put("意见：", checkFundVO.getFlowcontent());
			contentList.add(map);
			DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
			dingTalkReqVo.setTitle("财务系统驳回信息");
			@@ -494,22 +495,19 @@

			}
			//办公室主任审批通过之后，就需要把“办公室主任”的名字填上
			List<SysUser> sysUsers =null;
			if(StringUtils.isNotEmpty(user.getUserName())) {
			SysUser su = new SysUser();
			su.setUserName(user.getUserName());
			sysUsers = sysUserMapper.selectAllocatedList(su);
			log.info("差旅sysUsers返回的值为:{}", sysUsers);
			SysUser sysUser = null;
			if (StringUtils.isNotEmpty(user.getUserName())) {
			sysUser = sysUserMapper.selectUserByUserName(user.getUserName());
			log.info("差旅sysUsers返回的值为:{}", sysUser);
			}

			if (checkFundVO.getFlowconclusion() == 1 && !sysUsers.isEmpty()
			&& sysUsers.get(0).getRoles() != null
			&& sysUsers.get(0).getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))){
			if (checkFundVO.getFlowconclusion() == 1 && Objects.nonNull(sysUser) && sysUser.getRoles() != null && sysUser.getRoles().stream().anyMatch(role -> "officedirector".equals(role.getRoleKey()))) {
			serviceReimbursement.setOfficedirector(user.getNickName());
			serviceReimbursement.setUploadStates(1);

			Boolean aBoolean1 = null;
			if (newSwitch == 1) {
			log.info("差旅newSwitch返回的值为:{}", newSwitch);
			aBoolean1 = sendData(serviceReimbursement);
			if (!aBoolean1) {
			allMap.put("500", "发送失败");

	ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史