Merge branch 'dev' into test

@@ -114,7 +114,7 @@ func GetUserPermission(userCompanyid int64, code ...string) (map[string]Permissi
 				FROM role_menu AS a
 				FROM role_menu AS a
 				JOIN user_role AS b ON a.role_id = b.role_id
 				JOIN user_role AS b ON a.role_id = b.role_id
 				JOIN role AS c ON a.role_id = c.id
 				JOIN role AS c ON a.role_id = c.id
-				WHERE b.user_company_id=? AND c.delete_at =0 `
+				WHERE b.user_company_id=? AND c.delete_at =0 And b.enable_status=1  `
 	if len(code) > 0 {
 	if len(code) > 0 {
 		datasql = datasql + fmt.Sprintf(` and a.code = "%s" `, code[0])
 		datasql = datasql + fmt.Sprintf(` and a.code = "%s" `, code[0])
 	}
 	}