Authored by zhengyouwei

update

@@ -114,6 +114,7 @@ public class WorkSystemCtrl { @@ -114,6 +114,7 @@ public class WorkSystemCtrl {
114 public int createReleaseWorkJob(@RequestBody ReleaseWorkJob releaseWorkJob, HttpSession session) { 114 public int createReleaseWorkJob(@RequestBody ReleaseWorkJob releaseWorkJob, HttpSession session) {
115 User user = (User) session.getAttribute("user"); 115 User user = (User) session.getAttribute("user");
116 releaseWorkJob.setDevelop(user.getName()); 116 releaseWorkJob.setDevelop(user.getName());
  117 + releaseWorkJob.setEnvironment(releaseWorkJob.getEnvironment().substring(1));
117 BaseResponse<Integer> baseResponse = httpRestClient.defaultPost(HttpUriContants.CREATE_RELEASEWORKJOB, releaseWorkJob, BaseResponse.class); 118 BaseResponse<Integer> baseResponse = httpRestClient.defaultPost(HttpUriContants.CREATE_RELEASEWORKJOB, releaseWorkJob, BaseResponse.class);
118 return baseResponse.getData(); 119 return baseResponse.getData();
119 } 120 }
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 var platform = $('input:radio[name=platform]:checked').val(); 184 var platform = $('input:radio[name=platform]:checked').val();
185 var envuronments = ""; 185 var envuronments = "";
186 $('input[name="environment"]:checked').each(function () { 186 $('input[name="environment"]:checked').each(function () {
187 - envuronments = envuronments + "|" + $(this).val();//向数组中添加元素 187 + envuronments = envuronments + "," + $(this).val();//向数组中添加元素
188 }); 188 });
189 var project = $("#prjects option:selected").val(); 189 var project = $("#prjects option:selected").val();
190 var test = $("#test option:selected").val(); 190 var test = $("#test option:selected").val();
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 <button type="button" class="btn btn-primary" onclick="editWork(${pendingJob.id},'${pendingJob.type}',3)">拒绝</button> 147 <button type="button" class="btn btn-primary" onclick="editWork(${pendingJob.id},'${pendingJob.type}',3)">拒绝</button>
148 </c:otherwise> 148 </c:otherwise>
149 </c:choose> 149 </c:choose>
150 - <button type="button" class="btn btn-danger" onclick="editWork(${pendingJob.id},${pendingJob.type},-1)">关闭</button> 150 + <button type="button" class="btn btn-danger" onclick="editWork(${pendingJob.id},'${pendingJob.type}',-1)">关闭</button>
151 </div> 151 </div>
152 </div> 152 </div>
153 </c:if> 153 </c:if>