Merge branch 'bzq/dev' of eta_mini/eta_mini_api into debug

controllers/user.go

@@ -747,11 +747,22 @@ func (this *UserAuthController) Info() {
 	if user == nil {
 		user = &models.User{}
 	}
-	department, err := models.GetSysDepartmentById(user.SellerDepartmentId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "查询失败"
-		br.ErrMsg = "查询失败，系统异常，Err:" + err.Error()
-		return
+	var department *models.SysDepartment
+	var err error
+	if user.SellerDepartmentId > 0 {
+		department, err = models.GetSysDepartmentById(user.SellerDepartmentId)
+		if err != nil {
+			if err.Error() == utils.ErrNoRow() {
+				br.Msg = "查询失败"
+				br.ErrMsg = "部门不存在，系统异常，Err:" + err.Error()
+				return
+			}
+			br.Msg = "查询失败"
+			br.ErrMsg = "查询失败，系统异常，Err:" + err.Error()
+			return
+		}
+	} else {
+		department = new(models.SysDepartment)
 	}
 	private, err := services.GetPrivateChartPermissionList()
 	if err != nil {