Merge branch 'master' of http://git.shengws.com/csx/XT_New

.gitignore

@@ -1,5 +0,0 @@
-.svn
-.git
-XT.ext
-/*.exe
-/*.exe~

controllers/inspection_api_controller.go

@@ -432,7 +432,7 @@ func (c *InspectionApiController) GetPatientInspections() {
 
 	date := ""
 	if len(inspections) > 0 {
-		date = time.Unix(dateTime, 0).Format("2006-01-02")
+		date = time.Unix(dateTime, 0).Format("2006-01-02 15:04")
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

service/inspection_service.go

@@ -8,7 +8,13 @@ import (
 )
 
 func GetInspectionReference(orgId int64) (reference []*models.InspectionReference, err error) {
-	err = readDb.Model(&models.InspectionReference{}).Where("(org_id=0 OR org_id=?) and status=1", orgId).Order("project_id").Find(&reference).Error
+	var count int
+	err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Count(&count).Error
+	if count > 0 {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Order("project_id").Find(&reference).Error
+	} else {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1").Order("project_id").Find(&reference).Error
+	}
 	return
 }