From ebab2501fa485c8d62d90b67aabe6f6d81847636 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 16:12:05 +0800
Subject: [PATCH] 6
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java | 15 ++--
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 14 ++--
modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml | 12 +---
zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 12 +++
zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml | 33 +++++-----
zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java | 2
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 33 ++++++++---
web/src/views/modules/testCheckOrder/TestCheckOrder.vue | 48 ++++++++++------
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java | 4
10 files changed, 103 insertions(+), 72 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index c626323..a19671b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -1,6 +1,7 @@
package com.zt.life.modules.project.controller;
+import cn.hutool.core.convert.Convert;
import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
@@ -15,6 +16,7 @@
import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.sys.service.SysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -45,6 +47,9 @@
private ProjectService projectService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysUserService sysUserService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -82,9 +87,11 @@
String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "project");
- map.put("year",year);
+ map.put("year", year);
project.setYear(year);
project.setCode(sysCodeRuleService.getNewCode(map));
+ String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
+ project.setProjectLeader(leaderName);
projectService.insert(project);
return Result.ok();
}
@@ -95,8 +102,9 @@
public Result update(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
+ String leaderName = sysUserService.getUsersName(Convert.toLong(project.getProjectLeader()));
+ project.setProjectLeader(leaderName);
projectService.update(project);
-
return Result.ok();
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
index a7c32a7..40fdec2 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
@@ -57,7 +57,8 @@
@ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
@ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"),
- @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"), @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK")})
+ @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"),
+ @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK")})
public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(testCheckOrderService.page(queryFilter));
}
@@ -72,7 +73,7 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody CheckOrderDto checkOrderDto) {
+ public Result<Long> insert(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, AddGroup.class, DefaultGroup.class);
/* Map<String, String> map = new HashMap<>();
@@ -80,19 +81,19 @@
map.put("funCode", "test_check_order_"+pagecode);
map.put("projectId", checkOrderDto.getProjectId().toString());
checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));*/
- Boolean result = testCheckOrderService.save(checkOrderDto);
- return Result.ok();
+ Long result = testCheckOrderService.save(checkOrderDto);
+ return Result.ok(result);
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody CheckOrderDto checkOrderDto) {
+ public Result<Long> update(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, UpdateGroup.class, DefaultGroup.class);
- Boolean result = testCheckOrderService.save(checkOrderDto);
+ Long result = testCheckOrderService.save(checkOrderDto);
- return Result.ok();
+ return Result.ok(result);
}
@DeleteMapping("deleteCheckOrder")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
index 1d396dd..f07502a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java
@@ -93,7 +93,7 @@
return data;
}
- public Boolean save(CheckOrderDto checkOrderDto) {
+ public Long save(CheckOrderDto checkOrderDto) {
Long checkId = checkOrderDto.getCheckOrder().getId();
if (checkId != null)
baseDao.updateById(checkOrderDto.getCheckOrder());
@@ -117,6 +117,6 @@
checkOrderListService.insert(checkOrderList);
}
}
- return true;
+ return checkId;
}
}
diff --git a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
index 7d08e68..6eebb35 100644
--- a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml
@@ -6,15 +6,9 @@
<select id="getList" resultType="com.zt.life.modules.testCheckOrder.model.TestCheckOrderList">
select a.*
from test_check_order_list a
- <where>
- a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
- </if>
- </where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ where check_order_id = ${checkId}
+ and is_delete = 0
+ ORDER BY no
</select>
<select id="itemList" resultType="com.zt.life.modules.testCheckOrder.model.TestCheckOrderList">
SET @row_number = 0;
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index dfbf98f..5002cc8 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -16,12 +16,12 @@
<el-input v-model="dataForm.project.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
</el-form-item>
<el-form-item label="鐢宠浜�" style="width: 49%">
- <el-input :disabled="stepMarker=='pzxrk_first'" v-model="dataForm.configItemWarehouse.applicant"
+ <el-input :disabled="stepMarker!=='pzxrk_first'" v-model="dataForm.configItemWarehouse.applicant"
placeholder="璇疯緭鍏ョ敵璇蜂汉"></el-input>
</el-form-item>
<el-form-item label="鐢宠鏃ユ湡" style="width: 49%">
<el-date-picker
- :disabled="stepMarker=='pzxrk_first'"
+ :disabled="stepMarker!=='pzxrk_first'"
v-model="dataForm.configItemWarehouse.applyDate"
type="date"
placeholder="璇烽�夋嫨鐢宠鏃ユ湡">
@@ -120,7 +120,7 @@
<el-table-column prop="examineItem" min-width="300" label="妫�鏌ラ」"></el-table-column>
<el-table-column label="妫�鏌ョ粨鏋�" width="250" align="center">
<template slot-scope="scope">
- <zt-dict :disabled="stepMarker=='wplz_qash'" v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�"
+ <zt-dict :disabled="stepMarker!=='wplz_qash'" v-model="scope.row.examineResult" placeholder="妫�鏌ョ粨鏋�"
dict="tristate2" :radio="true"
clearable></zt-dict>
</template>
@@ -134,7 +134,7 @@
</el-table>
<div class="el-border-top">
<el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
- <zt-dict :disabled="stepMarker=='wplz_qash'" v-model="dataForm.configItemWarehouse.qaAuditResults"
+ <zt-dict :disabled="stepMarker!=='wplz_qash'" v-model="dataForm.configItemWarehouse.qaAuditResults"
dict="is_pass" :radio="true"
clearable></zt-dict>
</el-form-item>
@@ -173,7 +173,7 @@
</el-table>
<div class="el-border-top">
<el-form-item label="瀹℃牳缁撴灉" style="width: 99%">
- <zt-dict :disabled="stepMarker=='wplz_cmsh'" v-model="dataForm.configItemWarehouse.cmAuditResults"
+ <zt-dict :disabled="stepMarker!=='wplz_cmsh'" v-model="dataForm.configItemWarehouse.cmAuditResults"
placeholder="瀹℃牳缁撴灉" dict="is_pass" :radio="true"
clearable></zt-dict>
</el-form-item>
@@ -255,6 +255,7 @@
{pageCode: 'report', name: '杞欢娴嬭瘯鎶ュ憡'},
{pageCode: 'other', name: '鍏朵粬'}
],
+ pageNameCode: {杞欢娴嬭瘯璁″垝:'plan', 杞欢娴嬭瘯璇存槑: 'explain', 杞欢娴嬭瘯璁板綍: 'record', 杞欢娴嬭瘯鎶ュ憡: 'report'},
dataForm: {
id: '',
configItemWarehouse: {
@@ -332,7 +333,7 @@
// },
handleCommand(pageCode) {
const selectedItem = this.menuOptions.find(item => item.pageCode === pageCode);
- console.log(selectedItem,"handleCommand(pageCode) selectedItem")
+ console.log(selectedItem, "handleCommand(pageCode) selectedItem")
if (selectedItem.pageCode === 'other') {
this.dataForm.configItemList.push({})
} else if (selectedItem) {
@@ -344,11 +345,18 @@
})
},
openCheckOrderWin(row) {
- row.projectId = this.dataForm.projectId
- this.$refs.addOrUpdate.$refs.dialog.init(null, row)
+ console.log(row, "openCheckOrderWin(row)")
+ row.projectId = this.dataForm.projectId
+ if (!row.pageCode){
+ row.pageCode = this.pageNameCode[row.itemName]
+ console.log(row.itemName,row.pageCode, "row.itemName,openCheckOrderWin(row) row.pageCode")
+ }
+ this.$refs.addOrUpdate.$refs.dialog.init(null, row)
+
},
setCheckId(checkId, row) {
- row.checkId = checkId
+ console.log(checkId, row, "setCheckId(checkId, row)")
+ this.$set(row, 'checkId', checkId)
},
// 鑾峰彇淇℃伅
async getInfo() {
@@ -374,6 +382,13 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
+/* if (this.stepMarker=='' && submitType == 'bl') {
+ for(666)
+ if (this.pageNameCode[row.itemName] && !row.isCheck) {
+ alert(444)
+ return
+ }
+ }*/
if (submitType == 'tj' || submitType == 'bl') {
let flowInfo = {
flowCode: 'pzxrk',
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 5c945e7..beb4740 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -116,9 +116,9 @@
export default {
data() {
return {
- parentRow: null,
+ configDetailRow: null,
subtitle: '',
- pageName: {plan: '娴嬭瘯璁″垝', explain: '娴嬭瘯璇存槑', record: '娴嬭瘯璁板綍', report: '娴嬭瘯鎶ュ憡'},
+ pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
dataForm: {
id: '',
projectId: '',
@@ -141,9 +141,10 @@
},
methods: {
init(id, row) {
- this.parentRow = row
- console.log(id, row, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟')
- if (id) {
+ this.configDetailRow = row
+ if (row.checkId) {
+ this.dataForm.id = row.checkId
+ } else if (id) {
this.dataForm.id = id
} else {
this.dataForm.id = row.id
@@ -154,6 +155,7 @@
if (row.projectId) {
this.dataForm.projectId = row.projectId
}
+ console.log(id, row, this.subtitle, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟')
//this.dataForm.disabled
this.getInfo()
@@ -182,7 +184,7 @@
if (res.success) {
await this.$tip.success()
this.$refs.dialog.close()
- this.$emit('recall', this.dataForm, this.parentRow)
+ this.$emit('recall', res.data, this.configDetailRow)
}
}
}
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
index ab98cd1..9c22e8a 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder.vue
@@ -1,7 +1,8 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-testCheckOrder-testCheckOrder}">
- <zt-table-wraper query-url="/testCheckOrder/TestCheckOrder/page" delete-url="/testCheckOrder/TestCheckOrder" v-slot="{ table }">
+ <zt-table-wraper query-url="/testCheckOrder/TestCheckOrder/page" delete-url="/testCheckOrder/TestCheckOrder/deleteCheckOrder"
+ v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ紪鍙�" clearable></el-input>
@@ -15,16 +16,23 @@
<zt-button type="delete" perm="testCheckOrder:delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
- <el-table-column type="selection" width="40"/>
- <el-table-column prop="code" label="缂栧彿"/>
- <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
- <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
- <zt-table-column-handle :table="table" edit-perm="testCheckOrder:update" delete-perm="testCheckOrder::delete"/>
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
+ border @selection-change="table.selectionChangeHandle">
+ <el-table-column align="center" type="selection" width="40"/>
+ <el-table-column prop="code" label="缂栧彿"/>
+ <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
+ <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
+ <zt-table-column-handle :table="table" :hasEdit='false' edit-perm="testCheckOrder:update"
+ delete-perm="testCheckOrder::delete">
+ <template v-slot="{row}">
+ <zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
+ </template>
+
+ </zt-table-column-handle>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update ref="addOrUpdate" @recall="table.query"/>
- <ProjectSelect :pageCode="pageCode" ref="projectSelect"
+ <ProjectSelect :pageCode="pageCode" ref="projectSelect"
@refreshDataList="table.query"
@setProjectInfo="openAddWin">
</ProjectSelect>
@@ -38,12 +46,12 @@
import AddOrUpdate from './TestCheckOrder-AddOrUpdate'
import ProjectSelect from "../project/Project-select.vue"
import Preview from '@/views/pages/view'
+
export default {
- props: {
- },
+ props: {},
data() {
return {
- pageCode : '',
+ pageCode: '',
dataForm: {
code: '',
softwareidentity: '',
@@ -59,16 +67,20 @@
ProjectSelect,
Preview
},
- methods:{
+ methods: {
add() {
- console.log(this.pageCode,'this.pageCode')
- this.$refs.projectSelect.$refs.dialog.init("test_check_order",{pageCode: this.pageCode})
+ console.log(this.pageCode, 'this.pageCode')
+ this.$refs.projectSelect.$refs.dialog.init("test_check_order", {pageCode: this.pageCode})
},
- openAddWin(row,pageCode) {
- console.log(row.id, 'row.id')
- this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: row.id,pageCode:pageCode})
+ openAddWin(projectRow) {
+ console.log(projectRow, 'openAddWin(projectRow) projectRow')
+ this.$refs.addOrUpdate.$refs.dialog.init(null, {id: null, projectId: projectRow.id, pageCode: this.pageCode})
},
- preview(row){
+ openEditWin(checkOrderRow){
+ console.log(checkOrderRow,'openEditWin(checkOrderRow)')
+ this.$refs.addOrUpdate.$refs.dialog.init(checkOrderRow.id, {id: checkOrderRow.id, projectId: checkOrderRow.projectId, pageCode: this.pageCode})
+ },
+ preview(row) {
this.$refs.view.openAccessoryFormatSingle(row)
}
}
diff --git a/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java b/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
index 561b9d7..e0bfd82 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
@@ -56,5 +56,5 @@
Integer checkTestHome(String systemId, Long userId);
List<SysUser> getUsersList();
- String getUsersName();
+ String getUsersName(Long id);
}
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
index f97e69e..9149cc0 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
@@ -336,7 +336,7 @@
}
public String getUsersName(Long id) {
- return baseDao.getUsersName();
+ return baseDao.getUsersName(id);
}
public SysUser getUserInfo(Long id) {
diff --git a/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml b/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml
index 6075da2..bb0eaef 100644
--- a/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml
+++ b/zt/core/src/main/resources/mapper/workflowconfig/WfDefStepDao.xml
@@ -47,9 +47,9 @@
d.dept_name AS companyName
FROM
WF_DEF_STEP a
- LEFT JOIN SYS_USER b ON instr(a.APPROVER_IDS,b.user_id) > 0
- LEFT JOIN SYS_DEPT c ON b.dept_id = c.dept_id
- LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.dept_id
+ LEFT JOIN SYS_USER b ON instr(a.APPROVER_IDS,b.id) > 0
+ LEFT JOIN SYS_DEPT c ON b.dept_id = c.id
+ LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.id
WHERE
a.is_delete = 0
AND a.id = #{stepsId}
@@ -57,11 +57,10 @@
<select id="getUserList" resultType="com.zt.modules.workflowconfig.model.WfDefStep">
SELECT
- a.user_id AS userId,
- a.user_name AS userName,
- a.nick_name AS realName,
- c.dept_name AS deptName,
- d.dept_name AS companyName
+ a.id AS userId,
+ a.username AS userName,
+ a.real_name AS realName,
+ c.name AS deptName
FROM
(
SELECT
@@ -78,12 +77,12 @@
and ${whereSql}
</if>
<if test="userName != '' and userName != null">
- and a.user_name like concat('%',#{userName},'%')
+ and a.name like concat('%',#{userName},'%')
</if>
- AND a.del_flag = 0
- ORDER BY a.user_name
+ AND a.is_delete = 0
+ ORDER BY a.name
) a
- LEFT JOIN SYS_DEPT c ON a.dept_id = c.dept_id
+ LEFT JOIN SYS_DEPT c ON a.dept_id = c.id
</select>
<update id="addWorkflowStepsUser">
@@ -103,11 +102,11 @@
a.id as stepId,
b.id as roleId,
b.name as roleName,
- d.dept_name AS companyName
+ d.name AS companyName
FROM
WF_DEF_STEP a
LEFT JOIN SYS_ROLE b ON instr(a.APPROVER_ROLE_IDS,b.id) > 0
- LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.dept_id
+ LEFT JOIN SYS_DEPT d ON b.COMPANY_ID = d.id
WHERE
a.is_delete = 0
AND a.id = #{stepsId}
@@ -117,7 +116,7 @@
SELECT
a.id AS roleId,
a.name AS roleName,
- d.dept_name AS companyName
+ d.name AS companyName
FROM
(
SELECT
@@ -139,8 +138,8 @@
AND a.is_delete = 0
) a
- LEFT JOIN SYS_DEPT d ON a.COMPANY_ID = d.dept_id
- ORDER BY d.dept_name, a.sort
+ LEFT JOIN SYS_DEPT d ON a.COMPANY_ID = d.id
+ ORDER BY d.name, a.sort
</select>
<update id="addWorkflowStepsRole">
--
Gitblit v1.9.1