init

repositories/system/app_cat_repo.go

@@ -21,7 +21,7 @@ func NewAppCatRepo(engine *xorm.Engine) *AppCatRepo {
 func (d *AppCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	limit     := m["limit"].(int)
 	page      := m["page"].(int)
-
+	
 	sqlSelect := ` SELECT A.*                `
 	sqlFrom   := ` FROM   app_cat   AS A     `
 	sqlWhere  := ` WHERE  A.deleted_flag = 0 `
@@ -103,6 +103,8 @@ func (d *AppCatRepo) Delete(m map[string]interface{}) error {
 	data.DeletedFlag = 1
 	data.DeletedBy = deletedBy
 	data.DeletedAt = time.Now()
-	_, err := d.engine.Where("app_cat_id = ?", appCatId).Update(data)
+	_, err := d.engine.
+		Where("app_cat_id = ?", appCatId).
+		Update(data)
 	return err
 }

repositories/system/app_permit_repo.go

@@ -18,11 +18,6 @@ func NewAppPermitRepo(engine *xorm.Engine) *AppPermitRepo {
 }
 
 func (d *AppPermitRepo) GetList(m map[string]interface{})([]viewmodels.AppPermitInfo, error) {
-	roleId    := m["roleId"].(int64)
-	keywords  := m["keywords"].(string)
-	appKey    := m["appKey"].(string)
-
-
 	sqlSelect := ` SELECT A.app_id,
                           A.role_id,
                           A.permit_id,
@@ -36,14 +31,14 @@ func (d *AppPermitRepo) GetList(m map[string]interface{})([]viewmodels.AppPermit
 	sqlFrom   := ` FROM  app_permit  AS A
                    JOIN  app         AS B ON (A.app_id = B.app_id) `
 	sqlWhere  := ` WHERE A.deleted_flag = 0 `
-	if appKey != "" {
-		sqlWhere +=  ` AND B.app_key = '` + appKey + "'"
+	if appKey, ok := m["appKey"]; ok {
+		sqlWhere +=  " AND B.app_key = '" + fmt.Sprintf("%s", appKey) + "'"
 	}
-	if roleId >= 0 {
+	if roleId, ok := m["roleId"]; ok {
 		sqlWhere += ` AND A.role_id = ` + fmt.Sprintf("%d", roleId)
 	}
-	if keywords != "" {
-		sqlWhere += ` AND A.permit_title like ` + "'%" + keywords + "%'"
+	if keywords, ok := m["keywords"]; ok {
+		sqlWhere += " AND A.permit_title like '%" + fmt.Sprintf("%s", keywords) + "%'"
 	}
 	sqlOrderBy := " ORDER BY A.app_id, A.role_id, A.parent_id, A.sort_no "
 	
@@ -70,12 +65,8 @@ func (d *AppPermitRepo) GetListByKey(appKey string, roleId int64)([]viewmodels.A
 	sqlFrom   := ` FROM  app_permit  AS A
                    JOIN  app         AS B ON (A.app_id = B.app_id) `
 	sqlWhere  := ` WHERE A.deleted_flag = 0 `
-	if appKey != "" {
-		sqlWhere += ` AND B.app_key = '` + appKey + "'"
-	}
-	if roleId >= 0 {
-		sqlWhere += ` AND A.role_id = ` + fmt.Sprintf("%d", roleId)
-	}
+	sqlWhere  += ` AND B.app_key = '` + appKey + "'"
+	sqlWhere  += ` AND A.role_id = ` + fmt.Sprintf("%d", roleId)
 	sqlOrderBy := " ORDER BY A.app_id, A.role_id, A.parent_id, A.sort_no "
 	
 	datalist := make([]viewmodels.AppPermitInfo, 0)

web/controllers/group_cat_controller.go

@@ -92,9 +92,9 @@ func (c *GroupCatController) DeleteByID(groupCatId int64) *JsonResult {
     userId := c.GetCurUserId()
     
     m := make(map[string]interface{})
-    m["ocId"]      = ocId
-    m["groupCatId"]= groupCatId
-    m["deletedBy"] = userId
+    m["ocId"]       = ocId
+    m["groupCatId"] = groupCatId
+    m["deletedBy"]  = userId
     err := c.Service.Delete(m)
     if err != nil {
         return ResultErr(err.Error(), nil)