Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/partnermg into dev

@@ -37,17 +37,16 @@ type PartnerInfo struct {
 }
 }
 
 
 //TODO
 //TODO
-func (partner *PartnerInfo) Update(data map[string]string) error {
-	return nil
-}
-
-//TODO
-func (partner *PartnerInfo) ChangeStatus(yesOrNo bool) error {
-	return nil
-}
-
-//TODO
-func (partner *PartnerInfo) ChangePassword(pwd string) error {
+func (partner *PartnerInfo) Update(data map[string]interface{}) error {
+	if v, ok := data["partnerName"]; ok {
+		partner.Partner.PartnerName = v.(string)
+	}
+	if v, ok := data["account"]; ok {
+		partner.Partner.Account = v.(string)
+	}
+	if v, ok := data["partnerCategory"]; ok {
+		partner.PartnerCategory = v.(int)
+	}
 	return nil
 	return nil
 }
 }
 
 

@@ -32,6 +32,7 @@ type adminDetailParam struct {
 	PermissionType []int  `json:"permissionType"`
 	PermissionType []int  `json:"permissionType"`
 	Status         int    `json:"status"`
 	Status         int    `json:"status"`
 	Account        string `json:"account"`
 	Account        string `json:"account"`
+	IsAdmin        int    `json:"isAdmin"`
 }
 }
 
 
 func (c *AdminUserController) SaveAdminUser() {
 func (c *AdminUserController) SaveAdminUser() {
@@ -91,6 +92,7 @@ func (c *AdminUserController) GetAdminUser() {
 		Id:      adminuser.Id,
 		Id:      adminuser.Id,
 		Account: adminuser.Account,
 		Account: adminuser.Account,
 		Status:  0,
 		Status:  0,
+		IsAdmin: 0,
 	}
 	}
 	for _, v := range adminuser.Permission {
 	for _, v := range adminuser.Permission {
 		rspData.PermissionType = append(rspData.PermissionType, v.Id)
 		rspData.PermissionType = append(rspData.PermissionType, v.Id)
@@ -98,6 +100,9 @@ func (c *AdminUserController) GetAdminUser() {
 	if adminuser.IsUsable {
 	if adminuser.IsUsable {
 		rspData.Status = 1
 		rspData.Status = 1
 	}
 	}
+	if adminuser.IsDefault {
+		rspData.IsAdmin = 1
+	}
 	c.ResponseData(rspData)
 	c.ResponseData(rspData)
 	return
 	return
 }
 }
@@ -162,10 +167,14 @@ func (c *AdminUserController) ListAdminUser() {
 			"account":    adminusers[i].Account,
 			"account":    adminusers[i].Account,
 			"permission": permissionTypes,
 			"permission": permissionTypes,
 			"statue":     0,
 			"statue":     0,
+			"isAdmin":    0,
 		}
 		}
 		if adminusers[i].IsUsable {
 		if adminusers[i].IsUsable {
 			m["statue"] = 1
 			m["statue"] = 1
 		}
 		}
+		if adminusers[i].IsDefault {
+			m["isAdmin"] = 1
+		}
 		listData = append(listData, m)
 		listData = append(listData, m)
 	}
 	}
 	c.ResponsePageList(listData, cnt, param.PageNumber)
 	c.ResponsePageList(listData, cnt, param.PageNumber)