Merge remote-tracking branch 'origin/dev/icss' into debug

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -62,10 +62,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             introduceInfo = this.getById(introduceVO.getId());
             introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
             introduceInfo.setGmtModified(DateUtil.now());
-        } else {
-            introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
-            introduceInfo.setGmtCreate(DateUtil.now());
         }
+        introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
+        introduceInfo.setGmtCreate(DateUtil.now());
         introduceInfo.setName(introduceVO.getName());
         introduceInfo.setRemark(introduceVO.getRemark());
 

icssman-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -141,23 +141,26 @@ public class VersionInfoFacade extends VersionInfoServiceImpl {
 		if (res) {
 			List<VersionDetail> dataNew = new ArrayList<VersionDetail>();
 			List<VersionDetailVO> datas = versionInfoVO.getVersionDetail();
-			for (VersionDetailVO data : datas) {
-				VersionDetail versionDetail = new VersionDetail();
-				versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
-				versionDetail.setGmtCreate(DateUtil.now());
-				versionDetail.setGmtModified(DateUtil.now());
-				versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
-				versionDetail.setDescription(data.getDescription());
-				versionDetail.setOrderNo(data.getOrderNo());
-				versionDetail.setTitle(data.getTitle());
-				versionDetail.setVersionId(versionInfo.getId());
-				//System.out.println("========versionInfo.getId()======" + versionInfo.getId());
-				versionDetail.setRemark(data.getRemark());
-				versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
-				dataNew.add(versionDetail);
-			}
+			if(datas!=null && datas.size()>0){
+				for (VersionDetailVO data : datas) {
+					VersionDetail versionDetail = new VersionDetail();
+					versionDetail.setCreator(UserUtils.getCurrentPrincipleID());
+					versionDetail.setGmtCreate(DateUtil.now());
+					versionDetail.setGmtModified(DateUtil.now());
+					versionDetail.setModifier(UserUtils.getCurrentPrincipleID());
+					versionDetail.setDescription(data.getDescription());
+					versionDetail.setOrderNo(data.getOrderNo());
+					versionDetail.setTitle(data.getTitle());
+					versionDetail.setVersionId(versionInfo.getId());
+					//System.out.println("========versionInfo.getId()======" + versionInfo.getId());
+					versionDetail.setRemark(data.getRemark());
+					versionDetail.setStatus(String.valueOf(StatusEnum.Enable.getKey()));
+					dataNew.add(versionDetail);
+				}
 
-			res = versionDetailServiceImpl.saveBatch(dataNew);
+				res = versionDetailServiceImpl.saveBatch(dataNew);	
+			}
+			
 			//System.out.println(res);
 		}
 		return res;

icssman-service/src/main/java/com/diagbot/facade/VitalOrderFacade.java

@@ -47,6 +47,8 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
             vitalOrder.setOrderNo(vitalOrderVO.getOrderNo());
             vitalOrder.setCreator(UserUtils.getCurrentPrincipleID());
             vitalOrder.setGmtCreate(DateUtil.now());
+            vitalOrder.setModifier(UserUtils.getCurrentPrincipleID());
+            vitalOrder.setGmtModified(DateUtil.now());
             vitalOrderList.add(vitalOrder);
         }
         vitalOrderServiceImpl.saveBatch(vitalOrderList);