|
@@ -236,6 +236,7 @@ func (s *projectAccountService) GetAll(projectId int) []viewmodels.ProjectAccoun
|
|
|
for _, data := range accountList {
|
|
|
//if data.IsAdmin != 1 {
|
|
|
account := comm.MakeProjectAccountVM(&data)
|
|
|
+
|
|
|
accountListVM = append(accountListVM, account)
|
|
|
//}
|
|
|
}
|
|
@@ -338,8 +339,8 @@ func (s *projectAccountService) SaveBs(viewAccount viewmodels.ProjectAccount, id
|
|
|
updateField := []string{"name", "company", "position", "telephone", "account_group"}
|
|
|
|
|
|
// 是否重新设置管理员
|
|
|
- if viewAccount.IsAdmin == 1 {
|
|
|
- account.IsAdmin = viewAccount.IsAdmin
|
|
|
+ if viewAccount.BoolAdmin {
|
|
|
+ account.IsAdmin = 1
|
|
|
updateField = append(updateField, "is_admin")
|
|
|
|
|
|
if err := s.updateAdminZero(projectId); err != nil {
|