Skip to content

Commit 400a5a4

Browse files
committed
fix: itsm添加白名单sql和接收表单参数bug
1 parent 003512e commit 400a5a4

File tree

2 files changed

+12
-2
lines changed
  • dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/itsm
  • dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl

2 files changed

+12
-2
lines changed

dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/bean/itsm/ItsmRequest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public class ItsmRequest {
2525
private String style;
2626
private String taskId;
2727

28+
private String formId;
29+
2830

2931
// getters和setters
3032
public String getCreateDate() {
@@ -99,6 +101,14 @@ public void setTaskId(String taskId) {
99101
this.taskId = taskId;
100102
}
101103

104+
public String getFormId() {
105+
return formId;
106+
}
107+
108+
public void setFormId(String formId) {
109+
this.formId = formId;
110+
}
111+
102112
public List<Map<String,String>> getDataList(){
103113
String dataStr = getData();
104114
if(!StringUtils.isEmpty(dataStr))

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/dao/impl/ProjectOrchestratorWhiteMapper.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
<select id="selectByProjectId" resultType="com.webank.wedatasphere.dss.workflow.entity.ProjectOrchestratorWhite">
25-
select * from dss_project_orchestrator_white where project_id = #{projectId} and orchestrator_id in ('*',#{orchestratorId}) order by id desc limit 1;
25+
select * from dss_project_orchestrator_white where project_id = #{projectId} and orchestrator_id = #{orchestratorId} order by id desc limit 1;
2626
</select>
2727

2828

@@ -33,7 +33,7 @@
3333

3434
<update id="updateById" parameterType="com.webank.wedatasphere.dss.workflow.entity.ProjectOrchestratorWhite">
3535
update dss_project_orchestrator_white set project_name= #{projectName}, orchestrator_name = #{orchestratorName},
36-
orchestrator_name = #{orchestrator_name},update_by= #{updateBy}
36+
orchestrator_name = #{orchestratorName},update_by= #{updateBy}
3737
where id = #{id}
3838
</update>
3939

0 commit comments

Comments
 (0)