Merge remote-tracking branch 'origin/deng' into deng

src/main/java/com/sipai/controller/work/KPIPointController.java

@@ -144,15 +144,17 @@ public class KPIPointController {
 	public String doview(HttpServletRequest request,Model model){
 		String userId = request.getParameter("id");
 		KPIPoint kPIPoint = this.kPIPointService.selectById(userId);
+		// 保存原始bizid用于MPoint查询
+		String originalBizid = kPIPoint.getBizid();
 		ProcessSection processSection = this.processSectionService.selectById(kPIPoint.getProcesssectionid());
 		if (processSection != null) {
 			kPIPoint.setProcessectionname(processSection.getName());
 		}
-		Company company = this.unitService.getCompById(kPIPoint.getBizid());
+		Company company = this.unitService.getCompById(originalBizid);
 		if (company != null) {
 			kPIPoint.setBizid(company.getName());
 		}
-		MPoint mPoint = this.mPointService.selectById(kPIPoint.getBizid(),kPIPoint.getMpointid());
+		MPoint mPoint = this.mPointService.selectById(originalBizid,kPIPoint.getMpointid());
 		if (mPoint != null) {
 			kPIPoint.setMpointname(mPoint.getParmname());
 		}

src/main/java/com/sipai/service/msg/MsgServiceImpl.java

@@ -454,7 +454,8 @@ public class MsgServiceImpl implements MsgService {
         String mtypeid = "";
         int result = 0;
         MsgType mtype = new MsgType();
-        mtype = this.msgtypeService.getMsgType(" where T.id='" + msgtypeid + "' order by T.insdt").get(0);
+        List<MsgType> msgType = this.msgtypeService.getMsgType(" where T.id='" + msgtypeid + "' order by T.insdt");
+        mtype = msgType.get(0);
         String sendway = mtype.getSendway();
         String[] recvids = recvid.split(",");
         //判断权限

src/main/webapp/jsp/work/KPIPointView.jsp

@@ -28,7 +28,7 @@
                 <input type="hidden" class="form-control" id="id" name ="id" value ="${kPIPoint.id}">
 	                <label class="col-sm-3 control-label">*所属厂区</label>
 	                <div class="col-sm-7">
-	                    <input  class="form-control select2" id="bizid" name ="bizid" style="width: 270px;" value ="${kPIPoint.bizid}" disabled/>
+	                    <input  class="form-control" id="bizid" name ="bizid" style="width: 270px;" value ="${kPIPoint.bizid}" disabled/>
 		                <!-- <input class="form-control" id="input_bizid" style="border: none;background: transparent;">
 		                <input type="hidden" id="hidden_bizid" name ="bizid" > -->
 	                </div>
@@ -36,7 +36,7 @@
                 <div class="form-group">
 	                <label class="col-sm-3 control-label">工艺段</label>
 	                <div class="col-sm-7">
-	                    <input  class="form-control select2" id="processsectionid" name ="processsectionid" value ="${kPIPoint.processectionname}" style="width: 270px;" disabled/>
+	                    <input  class="form-control" id="processsectionid" name ="processsectionid" value ="${kPIPoint.processectionname}" style="width: 270px;" disabled/>
 	                </div>
                 </div> 
                 <div class="form-group">