fix bug

controllers/base_auth.go

@@ -180,7 +180,12 @@ func (c *BaseAuthController) Prepare() {
 				}
 
 				if loginInfo != "1" {
-					msg := `该账号于` + admin.LastLoginTime + "在其他网络登录。此客户端已退出登录。"
+					lastLoginTime := admin.LastLoginTime
+
+					lastLoginTimeObj, err := time.Parse(utils.FormatDateWallWithLoc, lastLoginTime)
+					fmt.Println(lastLoginTimeObj, err)
+
+					msg := `该账号于` + lastLoginTimeObj.Format(utils.FormatDateTime) + "在其他网络登录。此客户端已退出登录。"
 					c.JSON(models.BaseResponse{Ret: 408, Msg: msg, ErrMsg: msg}, false, false)
 					c.StopRun()
 					return

models/report_approve/report_approve_flow.go

@@ -139,7 +139,7 @@ func (m *ReportApproveFlow) GetCountByCondition(condition string, pars []interfa
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	//err = o.Raw(sql, pars).QueryRow(&count)
-	err = global.DmSQL["rddp"].Raw(sql, pars).Scan(&count).Error
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return
 }
 

services/data/chart_classify.go

@@ -475,7 +475,7 @@ func MoveChartClassify(req data_manage.MoveChartClassifyReq, sysUser *system.Adm
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())
 			return
 		}
-		if exists != nil {
+		if exists != nil && exists.ChartClassifyId > 0 {
 			errMsg = "移动失败，分类名称已存在"
 			return
 		}