取消借款用途值

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowController.java

@@ -80,10 +80,6 @@ public class CmcBorrowController extends BaseController
     public AjaxResult add(@RequestBody CmcBorrow cmcBorrow)
     {
         cmcBorrow.setApplyDept(getLoginUser().getDeptId());
-        if (cmcBorrow.getProjectId() != null) {
-            CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(cmcBorrow.getProjectId());
-            cmcBorrow.setBorrowUsage(cmcProject.getProjectNumber() + "-" + cmcProject.getProjectName());
-        }
         return toAjax(cmcBorrowService.insertCmcBorrow(cmcBorrow));
     }
 

oa-back/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml

@@ -31,18 +31,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         SELECT
             rp.id_ as id,
-            rp.deployment_id_ as deploymentId,
-            rd.name_ as name,
-            rd.category_ as category,
-            rp.key_ as flowKey,
-            rp.version_ as version,
-            rp.suspension_state_ as suspensionState,
-            rd.deploy_time_  as deploymentTime
+            rp.DEPLOYMENT_ID_ as deploymentId,
+            rd.NAME_ as name,
+            rd.CATEGORY_ as category,
+            rp.KEY_ as flowKey,
+            rp.VERSION_ as version,
+            rp.SUSPENSION_STATE_ as suspensionState,
+            rd.DEPLOY_TIME_  as deploymentTime
         FROM
             ACT_RE_PROCDEF rp
-                LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.deployment_id_ = rd.id_
-        where rd.id_ = #{param}
-        order by rd.id_ asc
+                LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.DEPLOYMENT_ID_ = rd.ID_
+        where rd.ID_ = #{param}
+        order by rd.ID_ asc
     </select>