Merge branch 'xjjdev' into dev

cmd/internal/dao/artistinfo_artwork.go

@@ -151,7 +151,7 @@ func GetArtworkLockRecords(req *artistInfoArtwork.GetArtworkLockRecordsRequest)
 		if req.BaseAuditStatus == 2 {
 			//现要求暂存的画作也支持在待审核列表展示和审批
 			tx = tx.Where("base_audit_status = ? OR base_audit_status =1", req.BaseAuditStatus)
-		} else if req.BaseAuditStatus != 1 { //排除暂存状态
+		} else if req.BaseAuditStatus != 1 { //排除暂存状态,需求修改后，这个字段的暂存状态无法作为判断条件了
 			tx = tx.Where("base_audit_status = ?", req.BaseAuditStatus)
 		}
 
@@ -333,6 +333,9 @@ func CountAllArtworkTotal(artistUid string) (artworkTotal int64, artworkRulerTot
 }
 
 func UpdateArtworkExtData(request *artistInfoArtwork.ArtworkExtData) (err error) {
+	if request.ArtworkUid == "" {
+		return errors.New("画作uid不能为空")
+	}
 	err = db.DB.Model(model.ArtworkLockRecord{}).Where("artwork_uid = ?", request.ArtworkUid).Update("national_exhibition", request.NationalExhibition).Error
 	return
 }