Merge branch 'fix/check' into debug

# Conflicts:
#	utils/common.go

controllers/eta_trial.go

@@ -1908,7 +1908,7 @@ func (this *ETATrialController) AccountTransfer() {
 		return
 	}
 
-	if len(req.EtaTrialIdList) <= 0 {
+	if req.IsCheckAll != true && len(req.EtaTrialIdList) <= 0 {
 		br.Msg = "参数有误"
 		br.ErrMsg = "参数有误, 至少选中一个试用用户"
 		return

utils/common.go

@@ -1320,6 +1320,7 @@ func ContainsChinese(str string) bool {
 	}
 	return false
 }
+
 func TimeTransferString(format string, t time.Time) string {
 	str := t.Format(format)
 	if t.IsZero() {
@@ -1382,3 +1383,4 @@ func GetFiccAdminDepartmentIds() (idStr string) {
 	}
 	return
 }
+