管控bug

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/TaskProcessServiceImpl.java

@@ -1140,18 +1140,18 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
                                 BigDecimal difference = frMoney.subtract(loanMoney).abs();
                                 if (ObjectUtil.isNotEmpty(difference)) {
                                     //部分还完frMoney
-                                    jdbcTemplate.execute("update from c_expense_loan_info set return_money = " + frMoney + " where id = " + emLoanInfo.getId());
-                                    jdbcTemplate.execute("update from c_expense_financial_reimbursement_info set fr_money_actual = 0 where id = " + emFinancialReimbursementInfo.getId());
+                                    jdbcTemplate.execute("update c_expense_loan_info set return_money = " + frMoney + " where id = " + emLoanInfo.getId());
+                                    jdbcTemplate.execute("update c_expense_financial_reimbursement_info set fr_money_actual = 0 where id = " + emFinancialReimbursementInfo.getId());
                                 }
                             } else if (result == 0) { //相同，抵扣完成
-                                jdbcTemplate.execute("update from c_expense_loan_info set return_money = " + frMoney + " where id = " + emLoanInfo.getId());
-                                jdbcTemplate.execute("update from c_expense_financial_reimbursement_info set fr_money_actual = 0 where id = " + emFinancialReimbursementInfo.getId());
+                                jdbcTemplate.execute("update c_expense_loan_info set return_money = " + frMoney + " where id = " + emLoanInfo.getId());
+                                jdbcTemplate.execute("update c_expense_financial_reimbursement_info set fr_money_actual = 0 where id = " + emFinancialReimbursementInfo.getId());
                             } else { //如果借款金额小于报销金额，那么抵扣完借款，还要实际放款
                                 BigDecimal difference = frMoney.subtract(loanMoney).abs();
                                 if (ObjectUtil.isNotEmpty(difference)) {
                                     //全部还完loanMoney
-                                    jdbcTemplate.execute("update from c_expense_loan_info set return_money = " + loanMoney + " where id = " + emLoanInfo.getId());
-                                    jdbcTemplate.execute("update from c_expense_financial_reimbursement_info set fr_money_actual = " + difference + " where id = " + emFinancialReimbursementInfo.getId());
+                                    jdbcTemplate.execute("update c_expense_loan_info set return_money = " + loanMoney + " where id = " + emLoanInfo.getId());
+                                    jdbcTemplate.execute("update c_expense_financial_reimbursement_info set fr_money_actual = " + difference + " where id = " + emFinancialReimbursementInfo.getId());
                                 }
                             }
                         }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -199,7 +199,7 @@ public class WbsTreeContractController extends BladeController {
         if (("1").equals(tableOwner)) { //质检
             dataInfoId = contractId + "_" + parentId + "_" + tableOwner;
         } else { //监理
-            dataInfoId = contractIdRelation + "_" + parentId + "_" + tableOwner;
+            dataInfoId = contractIdRelation + "_" + parentId + "_" + classifyType;
         }
         Object data = redisTemplate.opsForValue().get("blade-manager::contract:wbstree:" + dataInfoId);
         if (data != null) {